diff --git a/.bazelrc b/.bazelrc
index 26a0600a44e..5946cd225c5 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
 
@@ -25,6 +24,5 @@ common --registry=https://bcr.bazel.build
 
 common --@rules_dotnet//dotnet/settings:strict_deps=false
 common --experimental_isolated_extension_usages
-common --incompatible_use_plus_in_repo_names
 
 try-import %workspace%/local.bazelrc
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/powershell-pr-check.yml b/.github/workflows/powershell-pr-check.yml
new file mode 100644
index 00000000000..b051939da33
--- /dev/null
+++ b/.github/workflows/powershell-pr-check.yml
@@ -0,0 +1,28 @@
+name: PowerShell PR Check
+
+on:
+  pull_request:
+    branches:
+      - main
+  workflow_dispatch:
+
+jobs:
+  powershell-pr-check:
+    name: powershell-pr-check
+    runs-on: ubuntu-latest
+    if: github.repository == 'microsoft/codeql'
+    permissions:
+      contents: write
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+          token: ${{ secrets.WORKFLOW_TOKEN }}
+      - name: Setup CodeQL
+        uses: ./.github/actions/fetch-codeql
+        with:
+          channel: release
+      - name: Compile PowerShell Queries
+        run: |
+          codeql query compile --check-only --keep-going powershell/ql/src
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..174ff08183e 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
diff --git a/.github/workflows/sync-main.yml b/.github/workflows/sync-main.yml
index 6a5735e8f6a..79190b194a3 100644
--- a/.github/workflows/sync-main.yml
+++ b/.github/workflows/sync-main.yml
@@ -21,17 +21,22 @@ jobs:
         run: |
           git config user.name Dilan Bhalla
           git config user.email dilanbhalla@microsoft.com
-      - name: Fetch
+      - name: Sync Main
         shell: bash
         run: |
           set -x
           git fetch
           git remote add upstream https://github.com/github/codeql.git
           git fetch upstream --tags --force
-      - name: Sync Main
+          git merge codeql-cli/latest
+      - name: Setup CodeQL
+        uses: ./.github/actions/fetch-codeql
+      - name: Compile PowerShell Queries
+        run: |
+          codeql query compile --check-only --keep-going powershell/ql/src
+      - name: Complete Sync
         shell: bash
         run: |
-          git merge codeql-cli/latest
           git push origin main
           git push origin --tags --force
 
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 327f62e7935..9304acd6d2e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -384,6 +384,7 @@ dependencies = [
  "clap",
  "codeql-extractor",
  "figment",
+ "glob",
  "itertools 0.13.0",
  "log",
  "num-traits",
@@ -631,6 +632,7 @@ dependencies = [
  "atomic",
  "pear",
  "serde",
+ "serde_yaml",
  "uncased",
  "version_check",
 ]
@@ -704,6 +706,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"
@@ -2058,6 +2066,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.5.0",
+ "itoa",
+ "ryu",
+ "serde",
+ "unsafe-libyaml",
+]
+
 [[package]]
 name = "sharded-slab"
 version = "0.1.7"
@@ -2381,6 +2402,12 @@ version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "229730647fbc343e3a80e463c1db7f78f3855d3f3739bee0dda773c9a037c90a"
 
+[[package]]
+name = "unsafe-libyaml"
+version = "0.2.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861"
+
 [[package]]
 name = "utf8parse"
 version = "0.2.2"
diff --git a/MODULE.bazel b/MODULE.bazel
index d0d9ad4ea23..2e8ed2e3d47 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -18,14 +18,14 @@ 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 = "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.16.1")
 bazel_dep(name = "googletest", version = "1.14.0.bcr.1")
 bazel_dep(name = "rules_rust", version = "0.52.2")
 
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..643d4089718
--- /dev/null
+++ b/actions/BUILD.bazel
@@ -0,0 +1,20 @@
+load("//misc/bazel:pkg.bzl", "codeql_pack")
+
+package(default_visibility = ["//visibility:public"])
+
+[
+    codeql_pack(
+        name = "-".join(parts),
+        srcs = [
+            "//actions/extractor",
+        ],
+        pack_prefix = "/".join(parts),
+    )
+    for parts in (
+        [
+            "experimental",
+            "actions",
+        ],
+        ["actions"],
+    )
+]
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 1b48e4372bf..c4436872b9a 100644
--- a/config/identical-files.json
+++ b/config/identical-files.json
@@ -351,9 +351,5 @@
   "Python model summaries test extension": [
     "python/ql/test/library-tests/dataflow/model-summaries/InlineTaintTest.ext.yml",
     "python/ql/test/library-tests/dataflow/model-summaries/NormalDataflowTest.ext.yml"
-  ],
-  "Diagnostics.qll": [
-    "ruby/ql/lib/codeql/ruby/Diagnostics.qll",
-    "rust/ql/lib/codeql/rust/Diagnostics.qll"
   ]
 }
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 73c42c5dfa0..0536c1c361b 100644
--- a/cpp/ql/lib/CHANGELOG.md
+++ b/cpp/ql/lib/CHANGELOG.md
@@ -1,3 +1,16 @@
+## 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
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 81c7f1dbc13..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.2
+lastReleaseVersion: 2.1.0
diff --git a/cpp/ql/lib/qlpack.yml b/cpp/ql/lib/qlpack.yml
index 91af68ed641..7b3e1aac9c8 100644
--- a/cpp/ql/lib/qlpack.yml
+++ b/cpp/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/cpp-all
-version: 2.0.2
+version: 2.1.0
 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
index d6245ecea82..d9b00e59fd5 100644
--- a/cpp/ql/lib/semmle/code/cpp/Concept.qll
+++ b/cpp/ql/lib/semmle/code/cpp/Concept.qll
@@ -6,9 +6,156 @@ 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() { result = "requires ..." }
+  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 7cfa779338f..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
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 3bdbd637cca..cc5a8d6c335 100644
--- a/cpp/ql/lib/semmle/code/cpp/PrintAST.qll
+++ b/cpp/ql/lib/semmle/code/cpp/PrintAST.qll
@@ -82,6 +82,8 @@ private Declaration getAnEnclosingDeclaration(Locatable ast) {
   or
   result = ast.(Parameter).getCatchBlock().getEnclosingFunction()
   or
+  result = ast.(Parameter).getRequiresExpr().getEnclosingFunction()
+  or
   result = ast.(Expr).getEnclosingDeclaration()
   or
   result = ast.(Initializer).getDeclaration()
@@ -101,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)
@@ -305,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
     )
   }
@@ -331,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())
   }
 
   /**
@@ -411,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`.
  */
@@ -570,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 = "" }
 
@@ -594,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`.
  */
@@ -697,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
@@ -921,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()"
@@ -941,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()"
@@ -980,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/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/dataflow/internal/DataFlowImpl1.qll b/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl1.qll
index ce964917e97..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) {
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 ce964917e97..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) {
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 ce964917e97..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) {
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 ce964917e97..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) {
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 ce964917e97..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) {
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 ce964917e97..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) {
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 ce964917e97..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) {
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 ce964917e97..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) {
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 ce964917e97..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) {
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 b4b46213b68..ab2d52d2de6 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
@@ -1364,7 +1364,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/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/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/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/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 8ae48181ae1..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();
 
@@ -121,33 +136,7 @@ abstract class FormattingFunction extends ArrayFunction, TaintFunction {
    * the first format specifier in the format string. We ignore all
    * implicit function definitions.
    */
-  int getFirstFormatArgumentIndex() {
-    // 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)
-    if this.hasDefinition()
-    then result = this.getDefinition().getNumberOfParameters()
-    else result = this.getNumberOfExplicitParameters()
-  }
-
-  /**
-   * Gets a non-implicit function declaration entry.
-   */
-  private FunctionDeclarationEntry getAnExplicitDeclarationEntry() {
-    result = this.getADeclarationEntry() and
-    not result.isImplicit()
-  }
-
-  /**
-   * Gets the number of parameters, excluding any parameters that have been defined
-   * from implicit function declarations. If there is some inconsistency in the number
-   * of parameters, then don't return anything.
-   */
-  private int getNumberOfExplicitParameters() {
-    forex(FunctionDeclarationEntry fde | fde = this.getAnExplicitDeclarationEntry() |
-      result = fde.getNumberOfParameters()
-    )
-  }
+  int getFirstFormatArgumentIndex() { result = firstFormatArgumentIndex }
 
   /**
    * Gets the position of the buffer size argument, if any.
diff --git a/cpp/ql/lib/semmlecode.cpp.dbscheme b/cpp/ql/lib/semmlecode.cpp.dbscheme
index 6f5d51e89e7..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
 );
@@ -1791,6 +1791,9 @@ case @expr.kind of
 | 388 = @datasizeof
 | 389 = @c11_generic
 | 390 = @requires_expr
+| 391 = @nested_requirement
+| 392 = @compound_requirement
+| 393 = @concept_id
 ;
 
 @var_args_expr = @vastartexpr
@@ -1909,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
@@ -2168,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 20534e223c9..7f0d99272e7 100644
--- a/cpp/ql/lib/semmlecode.cpp.dbscheme.stats
+++ b/cpp/ql/lib/semmlecode.cpp.dbscheme.stats
@@ -18,7 +18,7 @@
         </e>
         <e>
             <k>@location_default</k>
-            <v>29768202</v>
+            <v>29764890</v>
         </e>
         <e>
             <k>@location_stmt</k>
@@ -34,35 +34,35 @@
         </e>
         <e>
             <k>@file</k>
-            <v>123267</v>
+            <v>123251</v>
         </e>
         <e>
             <k>@folder</k>
-            <v>16342</v>
+            <v>16340</v>
         </e>
         <e>
             <k>@macro_expansion</k>
-            <v>33257556</v>
+            <v>33257760</v>
         </e>
         <e>
             <k>@other_macro_reference</k>
-            <v>859138</v>
+            <v>859029</v>
         </e>
         <e>
             <k>@function</k>
-            <v>4179893</v>
+            <v>4179363</v>
         </e>
         <e>
             <k>@fun_decl</k>
-            <v>4544093</v>
+            <v>4543516</v>
         </e>
         <e>
             <k>@var_decl</k>
-            <v>8040412</v>
+            <v>8039391</v>
         </e>
         <e>
             <k>@type_decl</k>
-            <v>3283868</v>
+            <v>3283451</v>
         </e>
         <e>
             <k>@namespace_decl</k>
@@ -70,7 +70,7 @@
         </e>
         <e>
             <k>@using_declaration</k>
-            <v>363266</v>
+            <v>363219</v>
         </e>
         <e>
             <k>@using_directive</k>
@@ -86,7 +86,7 @@
         </e>
         <e>
             <k>@parameter</k>
-            <v>6191397</v>
+            <v>6190611</v>
         </e>
         <e>
             <k>@membervariable</k>
@@ -98,7 +98,7 @@
         </e>
         <e>
             <k>@localvariable</k>
-            <v>576946</v>
+            <v>576945</v>
         </e>
         <e>
             <k>@enumconstant</k>
@@ -330,23 +330,23 @@
         </e>
         <e>
             <k>@pointer</k>
-            <v>568245</v>
+            <v>568173</v>
         </e>
         <e>
             <k>@type_with_specifiers</k>
-            <v>852134</v>
+            <v>852026</v>
         </e>
         <e>
             <k>@array</k>
-            <v>110193</v>
+            <v>110179</v>
         </e>
         <e>
             <k>@routineptr</k>
-            <v>625426</v>
+            <v>625424</v>
         </e>
         <e>
             <k>@reference</k>
-            <v>1276567</v>
+            <v>1276405</v>
         </e>
         <e>
             <k>@gnu_vector</k>
@@ -358,7 +358,7 @@
         </e>
         <e>
             <k>@rvalue_reference</k>
-            <v>333382</v>
+            <v>333340</v>
         </e>
         <e>
             <k>@block</k>
@@ -366,15 +366,15 @@
         </e>
         <e>
             <k>@decltype</k>
-            <v>27081</v>
+            <v>27078</v>
         </e>
         <e>
             <k>@usertype</k>
-            <v>5235606</v>
+            <v>5234008</v>
         </e>
         <e>
             <k>@mangledname</k>
-            <v>6062526</v>
+            <v>6061757</v>
         </e>
         <e>
             <k>@type_mention</k>
@@ -382,19 +382,19 @@
         </e>
         <e>
             <k>@routinetype</k>
-            <v>538891</v>
+            <v>538889</v>
         </e>
         <e>
             <k>@ptrtomember</k>
-            <v>37820</v>
+            <v>37815</v>
         </e>
         <e>
             <k>@specifier</k>
-            <v>24746</v>
+            <v>24743</v>
         </e>
         <e>
             <k>@gnuattribute</k>
-            <v>553770</v>
+            <v>553700</v>
         </e>
         <e>
             <k>@stdattribute</k>
@@ -410,15 +410,15 @@
         </e>
         <e>
             <k>@alignas</k>
-            <v>4669</v>
+            <v>4668</v>
         </e>
         <e>
             <k>@attribute_arg_token</k>
-            <v>25213</v>
+            <v>25210</v>
         </e>
         <e>
             <k>@attribute_arg_constant_expr</k>
-            <v>318441</v>
+            <v>318400</v>
         </e>
         <e>
             <k>@attribute_arg_empty</k>
@@ -438,11 +438,11 @@
         </e>
         <e>
             <k>@derivation</k>
-            <v>391566</v>
+            <v>391564</v>
         </e>
         <e>
             <k>@frienddecl</k>
-            <v>707049</v>
+            <v>707046</v>
         </e>
         <e>
             <k>@comment</k>
@@ -450,7 +450,7 @@
         </e>
         <e>
             <k>@namespace</k>
-            <v>12139</v>
+            <v>12138</v>
         </e>
         <e>
             <k>@specialnamequalifyingelement</k>
@@ -482,7 +482,7 @@
         </e>
         <e>
             <k>@parexpr</k>
-            <v>3587464</v>
+            <v>3587463</v>
         </e>
         <e>
             <k>@arithnegexpr</k>
@@ -582,11 +582,11 @@
         </e>
         <e>
             <k>@gtexpr</k>
-            <v>104123</v>
+            <v>104110</v>
         </e>
         <e>
             <k>@ltexpr</k>
-            <v>101789</v>
+            <v>101776</v>
         </e>
         <e>
             <k>@geexpr</k>
@@ -662,7 +662,7 @@
         </e>
         <e>
             <k>@subscriptexpr</k>
-            <v>364478</v>
+            <v>364477</v>
         </e>
         <e>
             <k>@callexpr</k>
@@ -738,11 +738,11 @@
         </e>
         <e>
             <k>@reference_to</k>
-            <v>1572188</v>
+            <v>1572182</v>
         </e>
         <e>
             <k>@ref_indirect</k>
-            <v>1901640</v>
+            <v>1901633</v>
         </e>
         <e>
             <k>@vacuous_destructor_call</k>
@@ -830,7 +830,7 @@
         </e>
         <e>
             <k>@sizeof_pack</k>
-            <v>5603</v>
+            <v>5602</v>
         </e>
         <e>
             <k>@hasassignexpr</k>
@@ -934,7 +934,7 @@
         </e>
         <e>
             <k>@ctordirectinit</k>
-            <v>110607</v>
+            <v>110606</v>
         </e>
         <e>
             <k>@ctorvirtualinit</k>
@@ -962,7 +962,7 @@
         </e>
         <e>
             <k>@static_cast</k>
-            <v>215647</v>
+            <v>215648</v>
         </e>
         <e>
             <k>@reinterpret_cast</k>
@@ -978,7 +978,7 @@
         </e>
         <e>
             <k>@lambdaexpr</k>
-            <v>21478</v>
+            <v>21475</v>
         </e>
         <e>
             <k>@param_ref</k>
@@ -1022,7 +1022,7 @@
         </e>
         <e>
             <k>@istriviallycopyableexpr</k>
-            <v>3735</v>
+            <v>3734</v>
         </e>
         <e>
             <k>@isliteraltypeexpr</k>
@@ -1358,11 +1358,23 @@
         </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>28015</v>
+            <v>28011</v>
         </e>
         <e>
             <k>@stmt_expr</k>
@@ -1414,11 +1426,11 @@
         </e>
         <e>
             <k>@stmt_decl</k>
-            <v>593118</v>
+            <v>593121</v>
         </e>
         <e>
             <k>@stmt_empty</k>
-            <v>192683</v>
+            <v>192682</v>
         </e>
         <e>
             <k>@stmt_continue</k>
@@ -1450,7 +1462,7 @@
         </e>
         <e>
             <k>@stmt_range_based_for</k>
-            <v>8404</v>
+            <v>8403</v>
         </e>
         <e>
             <k>@stmt_handler</k>
@@ -1466,31 +1478,31 @@
         </e>
         <e>
             <k>@ppd_if</k>
-            <v>667232</v>
+            <v>667148</v>
         </e>
         <e>
             <k>@ppd_ifdef</k>
-            <v>263344</v>
+            <v>263311</v>
         </e>
         <e>
             <k>@ppd_ifndef</k>
-            <v>266612</v>
+            <v>266579</v>
         </e>
         <e>
             <k>@ppd_elif</k>
-            <v>25213</v>
+            <v>25210</v>
         </e>
         <e>
             <k>@ppd_else</k>
-            <v>209181</v>
+            <v>209154</v>
         </e>
         <e>
             <k>@ppd_endif</k>
-            <v>1197190</v>
+            <v>1197038</v>
         </e>
         <e>
             <k>@ppd_plain_include</k>
-            <v>311437</v>
+            <v>311398</v>
         </e>
         <e>
             <k>@ppd_define</k>
@@ -1498,7 +1510,7 @@
         </e>
         <e>
             <k>@ppd_undef</k>
-            <v>258675</v>
+            <v>258642</v>
         </e>
         <e>
             <k>@ppd_include_next</k>
@@ -2152,7 +2164,7 @@
                 </e>
                 <e>
                     <k>seconds</k>
-                    <v>9348</v>
+                    <v>8429</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -2233,12 +2245,12 @@
                                 <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>6</a>
@@ -2247,33 +2259,33 @@
                                 </b>
                                 <b>
                                     <a>8</a>
-                                    <b>9</b>
-                                    <v>79</v>
+                                    <b>10</b>
+                                    <v>159</v>
                                 </b>
                                 <b>
-                                    <a>9</a>
+                                    <a>10</a>
                                     <b>11</b>
-                                    <v>159</v>
+                                    <v>119</v>
                                 </b>
                                 <b>
                                     <a>11</a>
-                                    <b>13</b>
+                                    <b>15</b>
                                     <v>159</v>
                                 </b>
                                 <b>
-                                    <a>14</a>
-                                    <b>17</b>
+                                    <a>16</a>
+                                    <b>19</b>
                                     <v>159</v>
                                 </b>
                                 <b>
-                                    <a>18</a>
-                                    <b>22</b>
+                                    <a>19</a>
+                                    <b>24</b>
                                     <v>159</v>
                                 </b>
                                 <b>
-                                    <a>25</a>
-                                    <b>91</b>
-                                    <v>159</v>
+                                    <a>40</a>
+                                    <b>89</b>
+                                    <v>119</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2341,22 +2353,22 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1358</v>
+                                    <v>1438</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>399</v>
+                                    <v>319</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>279</v>
+                                    <v>199</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>319</v>
+                                    <v>439</v>
                                 </b>
                                 <b>
                                     <a>7</a>
@@ -2365,19 +2377,19 @@
                                 </b>
                                 <b>
                                     <a>8</a>
-                                    <b>9</b>
-                                    <v>239</v>
-                                </b>
-                                <b>
-                                    <a>9</a>
-                                    <b>23</b>
+                                    <b>10</b>
                                     <v>279</v>
                                 </b>
                                 <b>
-                                    <a>25</a>
-                                    <b>88</b>
+                                    <a>10</a>
+                                    <b>26</b>
                                     <v>279</v>
                                 </b>
+                                <b>
+                                    <a>28</a>
+                                    <b>81</b>
+                                    <v>199</v>
+                                </b>
                             </bs>
                         </hist>
                     </val>
@@ -2427,13 +2439,13 @@
                                     <v>79</v>
                                 </b>
                                 <b>
-                                    <a>138</a>
-                                    <b>139</b>
+                                    <a>125</a>
+                                    <b>126</b>
                                     <v>39</v>
                                 </b>
                                 <b>
-                                    <a>144</a>
-                                    <b>145</b>
+                                    <a>128</a>
+                                    <b>129</b>
                                     <v>39</v>
                                 </b>
                             </bs>
@@ -2450,27 +2462,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4434</v>
+                                    <v>3635</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2437</v>
+                                    <v>1917</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1158</v>
+                                    <v>1558</v>
                                 </b>
                                 <b>
                                     <a>4</a>
-                                    <b>5</b>
-                                    <v>679</v>
+                                    <b>6</b>
+                                    <v>719</v>
                                 </b>
                                 <b>
-                                    <a>5</a>
-                                    <b>46</b>
-                                    <v>639</v>
+                                    <a>6</a>
+                                    <b>48</b>
+                                    <v>599</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2486,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>2037</v>
+                                    <v>1438</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>998</v>
+                                    <v>1358</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>918</v>
+                                    <v>639</v>
                                 </b>
                                 <b>
                                     <a>5</a>
-                                    <b>7</b>
-                                    <v>759</v>
+                                    <b>6</b>
+                                    <v>479</v>
                                 </b>
                                 <b>
-                                    <a>7</a>
-                                    <b>74</b>
-                                    <v>519</v>
+                                    <a>6</a>
+                                    <b>8</b>
+                                    <v>679</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>73</b>
+                                    <v>239</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2527,12 +2544,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7191</v>
+                                    <v>6512</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2157</v>
+                                    <v>1917</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2876,7 +2893,7 @@
                 </e>
                 <e>
                     <k>cpu_seconds</k>
-                    <v>7145</v>
+                    <v>7507</v>
                 </e>
                 <e>
                     <k>elapsed_seconds</k>
@@ -2926,17 +2943,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5757</v>
+                                    <v>6242</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>903</v>
+                                    <v>835</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>20</b>
-                                    <v>485</v>
+                                    <b>15</b>
+                                    <v>428</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2952,12 +2969,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6524</v>
+                                    <v>6976</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>620</v>
+                                    <v>530</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2970,10 +2987,20 @@
                         <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>
+                                    <v>11</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>11</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -2981,43 +3008,43 @@
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>8</a>
-                                    <b>9</b>
+                                    <a>9</a>
+                                    <b>10</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>10</a>
-                                    <b>11</b>
+                                    <a>11</a>
+                                    <b>12</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>13</a>
-                                    <b>14</b>
+                                    <a>16</a>
+                                    <b>17</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>51</a>
-                                    <b>52</b>
+                                    <a>49</a>
+                                    <b>50</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>164</a>
-                                    <b>165</b>
+                                    <a>154</a>
+                                    <b>155</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>171</a>
-                                    <b>172</b>
+                                    <a>160</a>
+                                    <b>161</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>191</a>
-                                    <b>192</b>
+                                    <a>204</a>
+                                    <b>205</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>243</a>
-                                    <b>244</b>
+                                    <a>248</a>
+                                    <b>249</b>
                                     <v>11</v>
                                 </b>
                             </bs>
@@ -3031,10 +3058,20 @@
                         <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>
+                                    <v>11</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>11</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -3042,43 +3079,43 @@
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>8</a>
-                                    <b>9</b>
+                                    <a>9</a>
+                                    <b>10</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>10</a>
-                                    <b>11</b>
+                                    <a>11</a>
+                                    <b>12</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>13</a>
-                                    <b>14</b>
+                                    <a>16</a>
+                                    <b>17</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>49</a>
-                                    <b>50</b>
+                                    <a>47</a>
+                                    <b>48</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>121</a>
-                                    <b>122</b>
+                                    <a>118</a>
+                                    <b>119</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>123</a>
-                                    <b>124</b>
+                                    <a>128</a>
+                                    <b>129</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>138</a>
-                                    <b>139</b>
+                                    <a>149</a>
+                                    <b>150</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>214</a>
-                                    <b>215</b>
+                                    <a>222</a>
+                                    <b>223</b>
                                     <v>11</v>
                                 </b>
                             </bs>
@@ -4851,31 +4888,31 @@
         </relation>
         <relation>
             <name>locations_default</name>
-            <cardinality>29768202</cardinality>
+            <cardinality>29764890</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>29768202</v>
+                    <v>29764890</v>
                 </e>
                 <e>
                     <k>container</k>
-                    <v>123267</v>
+                    <v>123251</v>
                 </e>
                 <e>
                     <k>startLine</k>
-                    <v>2095549</v>
+                    <v>2095283</v>
                 </e>
                 <e>
                     <k>startColumn</k>
-                    <v>36886</v>
+                    <v>36882</v>
                 </e>
                 <e>
                     <k>endLine</k>
-                    <v>2099752</v>
+                    <v>2099485</v>
                 </e>
                 <e>
                     <k>endColumn</k>
-                    <v>48093</v>
+                    <v>48086</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -4889,7 +4926,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>29768202</v>
+                                    <v>29764890</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4905,7 +4942,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>29768202</v>
+                                    <v>29764890</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4921,7 +4958,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>29768202</v>
+                                    <v>29764890</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4937,7 +4974,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>29768202</v>
+                                    <v>29764890</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4953,7 +4990,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>29768202</v>
+                                    <v>29764890</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4969,67 +5006,67 @@
                                 <b>
                                     <a>1</a>
                                     <b>11</b>
-                                    <v>9805</v>
+                                    <v>9804</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>18</b>
-                                    <v>10272</v>
+                                    <v>10270</v>
                                 </b>
                                 <b>
                                     <a>18</a>
                                     <b>30</b>
-                                    <v>9338</v>
+                                    <v>9337</v>
                                 </b>
                                 <b>
                                     <a>30</a>
                                     <b>42</b>
-                                    <v>9805</v>
+                                    <v>9804</v>
                                 </b>
                                 <b>
                                     <a>43</a>
                                     <b>61</b>
-                                    <v>9805</v>
+                                    <v>9804</v>
                                 </b>
                                 <b>
                                     <a>61</a>
                                     <b>79</b>
-                                    <v>9338</v>
+                                    <v>9337</v>
                                 </b>
                                 <b>
                                     <a>80</a>
                                     <b>106</b>
-                                    <v>9805</v>
+                                    <v>9804</v>
                                 </b>
                                 <b>
                                     <a>108</a>
                                     <b>149</b>
-                                    <v>9338</v>
+                                    <v>9337</v>
                                 </b>
                                 <b>
                                     <a>149</a>
                                     <b>199</b>
-                                    <v>9338</v>
+                                    <v>9337</v>
                                 </b>
                                 <b>
                                     <a>206</a>
                                     <b>291</b>
-                                    <v>9338</v>
+                                    <v>9337</v>
                                 </b>
                                 <b>
                                     <a>304</a>
                                     <b>469</b>
-                                    <v>9338</v>
+                                    <v>9337</v>
                                 </b>
                                 <b>
                                     <a>482</a>
                                     <b>850</b>
-                                    <v>9338</v>
+                                    <v>9337</v>
                                 </b>
                                 <b>
                                     <a>936</a>
                                     <b>2380</b>
-                                    <v>8404</v>
+                                    <v>8403</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5045,67 +5082,67 @@
                                 <b>
                                     <a>1</a>
                                     <b>8</b>
-                                    <v>9338</v>
+                                    <v>9337</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>13</b>
-                                    <v>9338</v>
+                                    <v>9337</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>20</b>
-                                    <v>9805</v>
+                                    <v>9804</v>
                                 </b>
                                 <b>
                                     <a>20</a>
                                     <b>32</b>
-                                    <v>9338</v>
+                                    <v>9337</v>
                                 </b>
                                 <b>
                                     <a>32</a>
                                     <b>43</b>
-                                    <v>9805</v>
+                                    <v>9804</v>
                                 </b>
                                 <b>
                                     <a>44</a>
                                     <b>61</b>
-                                    <v>9338</v>
+                                    <v>9337</v>
                                 </b>
                                 <b>
                                     <a>62</a>
                                     <b>72</b>
-                                    <v>9338</v>
+                                    <v>9337</v>
                                 </b>
                                 <b>
                                     <a>73</a>
                                     <b>93</b>
-                                    <v>9338</v>
+                                    <v>9337</v>
                                 </b>
                                 <b>
                                     <a>97</a>
                                     <b>128</b>
-                                    <v>9338</v>
+                                    <v>9337</v>
                                 </b>
                                 <b>
                                     <a>128</a>
                                     <b>180</b>
-                                    <v>9338</v>
+                                    <v>9337</v>
                                 </b>
                                 <b>
                                     <a>180</a>
                                     <b>267</b>
-                                    <v>9338</v>
+                                    <v>9337</v>
                                 </b>
                                 <b>
                                     <a>277</a>
                                     <b>414</b>
-                                    <v>9338</v>
+                                    <v>9337</v>
                                 </b>
                                 <b>
                                     <a>439</a>
                                     <b>1465</b>
-                                    <v>9338</v>
+                                    <v>9337</v>
                                 </b>
                                 <b>
                                     <a>1557</a>
@@ -5126,67 +5163,67 @@
                                 <b>
                                     <a>1</a>
                                     <b>4</b>
-                                    <v>8871</v>
+                                    <v>8870</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>7937</v>
+                                    <v>7936</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>7470</v>
+                                    <v>7469</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>8</b>
-                                    <v>11206</v>
+                                    <v>11204</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>10</b>
-                                    <v>9338</v>
+                                    <v>9337</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>15</b>
-                                    <v>10739</v>
+                                    <v>10737</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>23</b>
-                                    <v>9805</v>
+                                    <v>9804</v>
                                 </b>
                                 <b>
                                     <a>23</a>
                                     <b>28</b>
-                                    <v>11206</v>
+                                    <v>11204</v>
                                 </b>
                                 <b>
                                     <a>28</a>
                                     <b>34</b>
-                                    <v>9805</v>
+                                    <v>9804</v>
                                 </b>
                                 <b>
                                     <a>34</a>
                                     <b>44</b>
-                                    <v>9338</v>
+                                    <v>9337</v>
                                 </b>
                                 <b>
                                     <a>44</a>
                                     <b>55</b>
-                                    <v>9338</v>
+                                    <v>9337</v>
                                 </b>
                                 <b>
                                     <a>55</a>
                                     <b>66</b>
-                                    <v>9805</v>
+                                    <v>9804</v>
                                 </b>
                                 <b>
                                     <a>66</a>
                                     <b>77</b>
-                                    <v>8404</v>
+                                    <v>8403</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5202,67 +5239,67 @@
                                 <b>
                                     <a>1</a>
                                     <b>8</b>
-                                    <v>9338</v>
+                                    <v>9337</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>13</b>
-                                    <v>9338</v>
+                                    <v>9337</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>20</b>
-                                    <v>9805</v>
+                                    <v>9804</v>
                                 </b>
                                 <b>
                                     <a>20</a>
                                     <b>32</b>
-                                    <v>9338</v>
+                                    <v>9337</v>
                                 </b>
                                 <b>
                                     <a>32</a>
                                     <b>43</b>
-                                    <v>9805</v>
+                                    <v>9804</v>
                                 </b>
                                 <b>
                                     <a>43</a>
                                     <b>60</b>
-                                    <v>9338</v>
+                                    <v>9337</v>
                                 </b>
                                 <b>
                                     <a>61</a>
                                     <b>71</b>
-                                    <v>9338</v>
+                                    <v>9337</v>
                                 </b>
                                 <b>
                                     <a>72</a>
                                     <b>93</b>
-                                    <v>9338</v>
+                                    <v>9337</v>
                                 </b>
                                 <b>
                                     <a>94</a>
                                     <b>127</b>
-                                    <v>9338</v>
+                                    <v>9337</v>
                                 </b>
                                 <b>
                                     <a>128</a>
                                     <b>179</b>
-                                    <v>9338</v>
+                                    <v>9337</v>
                                 </b>
                                 <b>
                                     <a>180</a>
                                     <b>268</b>
-                                    <v>9338</v>
+                                    <v>9337</v>
                                 </b>
                                 <b>
                                     <a>278</a>
                                     <b>413</b>
-                                    <v>9338</v>
+                                    <v>9337</v>
                                 </b>
                                 <b>
                                     <a>437</a>
                                     <b>1465</b>
-                                    <v>9338</v>
+                                    <v>9337</v>
                                 </b>
                                 <b>
                                     <a>1554</a>
@@ -5283,67 +5320,67 @@
                                 <b>
                                     <a>1</a>
                                     <b>9</b>
-                                    <v>9805</v>
+                                    <v>9804</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>13</b>
-                                    <v>9338</v>
+                                    <v>9337</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>18</b>
-                                    <v>9338</v>
+                                    <v>9337</v>
                                 </b>
                                 <b>
                                     <a>18</a>
                                     <b>26</b>
-                                    <v>10272</v>
+                                    <v>10270</v>
                                 </b>
                                 <b>
                                     <a>27</a>
                                     <b>33</b>
-                                    <v>9338</v>
+                                    <v>9337</v>
                                 </b>
                                 <b>
                                     <a>33</a>
                                     <b>39</b>
-                                    <v>9338</v>
+                                    <v>9337</v>
                                 </b>
                                 <b>
                                     <a>39</a>
                                     <b>47</b>
-                                    <v>10272</v>
+                                    <v>10270</v>
                                 </b>
                                 <b>
                                     <a>47</a>
                                     <b>53</b>
-                                    <v>9338</v>
+                                    <v>9337</v>
                                 </b>
                                 <b>
                                     <a>53</a>
                                     <b>60</b>
-                                    <v>10272</v>
+                                    <v>10270</v>
                                 </b>
                                 <b>
                                     <a>60</a>
                                     <b>66</b>
-                                    <v>9338</v>
+                                    <v>9337</v>
                                 </b>
                                 <b>
                                     <a>66</a>
                                     <b>74</b>
-                                    <v>9805</v>
+                                    <v>9804</v>
                                 </b>
                                 <b>
                                     <a>74</a>
                                     <b>78</b>
-                                    <v>9805</v>
+                                    <v>9804</v>
                                 </b>
                                 <b>
                                     <a>78</a>
                                     <b>90</b>
-                                    <v>7003</v>
+                                    <v>7002</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5359,52 +5396,52 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>583186</v>
+                                    <v>583112</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>314239</v>
+                                    <v>314199</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>195640</v>
+                                    <v>195615</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>162022</v>
+                                    <v>162001</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>10</b>
-                                    <v>183033</v>
+                                    <v>183010</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>16</b>
-                                    <v>162956</v>
+                                    <v>162935</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>25</b>
-                                    <v>169026</v>
+                                    <v>169004</v>
                                 </b>
                                 <b>
                                     <a>25</a>
                                     <b>46</b>
-                                    <v>161088</v>
+                                    <v>161067</v>
                                 </b>
                                 <b>
                                     <a>46</a>
                                     <b>169</b>
-                                    <v>157353</v>
+                                    <v>157333</v>
                                 </b>
                                 <b>
                                     <a>169</a>
                                     <b>265</b>
-                                    <v>7003</v>
+                                    <v>7002</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5420,42 +5457,42 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>871278</v>
+                                    <v>871167</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>273616</v>
+                                    <v>273582</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>193773</v>
+                                    <v>193748</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>8</b>
-                                    <v>173695</v>
+                                    <v>173673</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>13</b>
-                                    <v>188169</v>
+                                    <v>188146</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>20</b>
-                                    <v>161088</v>
+                                    <v>161067</v>
                                 </b>
                                 <b>
                                     <a>20</a>
                                     <b>51</b>
-                                    <v>159687</v>
+                                    <v>159667</v>
                                 </b>
                                 <b>
                                     <a>51</a>
                                     <b>265</b>
-                                    <v>74240</v>
+                                    <v>74231</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5471,47 +5508,47 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>612135</v>
+                                    <v>612058</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>313305</v>
+                                    <v>313265</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>198442</v>
+                                    <v>198417</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>183033</v>
+                                    <v>183010</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>9</b>
-                                    <v>173228</v>
+                                    <v>173206</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>13</b>
-                                    <v>163423</v>
+                                    <v>163402</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>19</b>
-                                    <v>174629</v>
+                                    <v>174606</v>
                                 </b>
                                 <b>
                                     <a>19</a>
                                     <b>29</b>
-                                    <v>164823</v>
+                                    <v>164802</v>
                                 </b>
                                 <b>
                                     <a>29</a>
                                     <b>52</b>
-                                    <v>112528</v>
+                                    <v>112514</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5527,22 +5564,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1531974</v>
+                                    <v>1531779</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>348791</v>
+                                    <v>348747</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>162022</v>
+                                    <v>162001</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>16</b>
-                                    <v>52762</v>
+                                    <v>52755</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5558,47 +5595,47 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>587855</v>
+                                    <v>587781</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>316106</v>
+                                    <v>316066</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>197508</v>
+                                    <v>197483</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>168559</v>
+                                    <v>168537</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>9</b>
-                                    <v>158286</v>
+                                    <v>158266</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>14</b>
-                                    <v>170893</v>
+                                    <v>170872</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>21</b>
-                                    <v>175096</v>
+                                    <v>175073</v>
                                 </b>
                                 <b>
                                     <a>21</a>
                                     <b>32</b>
-                                    <v>162489</v>
+                                    <v>162468</v>
                                 </b>
                                 <b>
                                     <a>32</a>
                                     <b>63</b>
-                                    <v>157819</v>
+                                    <v>157799</v>
                                 </b>
                                 <b>
                                     <a>64</a>
@@ -6014,52 +6051,52 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>593459</v>
+                                    <v>593383</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>306301</v>
+                                    <v>306262</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>198442</v>
+                                    <v>198417</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>159687</v>
+                                    <v>159667</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>10</b>
-                                    <v>182566</v>
+                                    <v>182543</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>16</b>
-                                    <v>162022</v>
+                                    <v>162001</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>25</b>
-                                    <v>171360</v>
+                                    <v>171338</v>
                                 </b>
                                 <b>
                                     <a>25</a>
                                     <b>46</b>
-                                    <v>158753</v>
+                                    <v>158733</v>
                                 </b>
                                 <b>
                                     <a>46</a>
                                     <b>161</b>
-                                    <v>158286</v>
+                                    <v>158266</v>
                                 </b>
                                 <b>
                                     <a>162</a>
                                     <b>265</b>
-                                    <v>8871</v>
+                                    <v>8870</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6075,47 +6112,47 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>886686</v>
+                                    <v>886574</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>260076</v>
+                                    <v>260043</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>125135</v>
+                                    <v>125119</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>141010</v>
+                                    <v>140992</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>10</b>
-                                    <v>184901</v>
+                                    <v>184877</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>15</b>
-                                    <v>168559</v>
+                                    <v>168537</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>26</b>
-                                    <v>163423</v>
+                                    <v>163402</v>
                                 </b>
                                 <b>
                                     <a>26</a>
                                     <b>120</b>
-                                    <v>158286</v>
+                                    <v>158266</v>
                                 </b>
                                 <b>
                                     <a>121</a>
                                     <b>265</b>
-                                    <v>11673</v>
+                                    <v>11671</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6131,22 +6168,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1529639</v>
+                                    <v>1529445</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>341787</v>
+                                    <v>341744</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>170893</v>
+                                    <v>170872</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>10</b>
-                                    <v>57431</v>
+                                    <v>57424</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6162,47 +6199,47 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>623342</v>
+                                    <v>623262</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>303499</v>
+                                    <v>303461</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>201710</v>
+                                    <v>201685</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>183967</v>
+                                    <v>183944</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>9</b>
-                                    <v>169959</v>
+                                    <v>169938</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>13</b>
-                                    <v>166691</v>
+                                    <v>166670</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>19</b>
-                                    <v>175096</v>
+                                    <v>175073</v>
                                 </b>
                                 <b>
                                     <a>19</a>
                                     <b>29</b>
-                                    <v>161088</v>
+                                    <v>161067</v>
                                 </b>
                                 <b>
                                     <a>29</a>
                                     <b>52</b>
-                                    <v>114396</v>
+                                    <v>114381</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6218,52 +6255,52 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>599995</v>
+                                    <v>599919</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>306301</v>
+                                    <v>306262</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>197041</v>
+                                    <v>197016</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>169026</v>
+                                    <v>169004</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>9</b>
-                                    <v>156419</v>
+                                    <v>156399</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>14</b>
-                                    <v>169026</v>
+                                    <v>169004</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>21</b>
-                                    <v>177897</v>
+                                    <v>177875</v>
                                 </b>
                                 <b>
                                     <a>21</a>
                                     <b>32</b>
-                                    <v>162022</v>
+                                    <v>162001</v>
                                 </b>
                                 <b>
                                     <a>32</a>
                                     <b>60</b>
-                                    <v>158286</v>
+                                    <v>158266</v>
                                 </b>
                                 <b>
                                     <a>60</a>
                                     <b>65</b>
-                                    <v>3735</v>
+                                    <v>3734</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6279,62 +6316,62 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5136</v>
+                                    <v>5135</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>8</b>
-                                    <v>3735</v>
+                                    <v>3734</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>186</b>
-                                    <v>3735</v>
+                                    <v>3734</v>
                                 </b>
                                 <b>
                                     <a>193</a>
                                     <b>288</b>
-                                    <v>3735</v>
+                                    <v>3734</v>
                                 </b>
                                 <b>
                                     <a>294</a>
                                     <b>495</b>
-                                    <v>3735</v>
+                                    <v>3734</v>
                                 </b>
                                 <b>
                                     <a>503</a>
-                                    <b>554</b>
-                                    <v>3735</v>
+                                    <b>555</b>
+                                    <v>3734</v>
                                 </b>
                                 <b>
                                     <a>561</a>
                                     <b>633</b>
-                                    <v>3735</v>
+                                    <v>3734</v>
                                 </b>
                                 <b>
                                     <a>640</a>
                                     <b>758</b>
-                                    <v>3735</v>
+                                    <v>3734</v>
                                 </b>
                                 <b>
                                     <a>758</a>
                                     <b>869</b>
-                                    <v>3735</v>
+                                    <v>3734</v>
                                 </b>
                                 <b>
                                     <a>875</a>
                                     <b>1074</b>
-                                    <v>3735</v>
+                                    <v>3734</v>
                                 </b>
                                 <b>
                                     <a>1074</a>
                                     <b>1281</b>
-                                    <v>3735</v>
+                                    <v>3734</v>
                                 </b>
                                 <b>
                                     <a>1289</a>
                                     <b>1590</b>
-                                    <v>3735</v>
+                                    <v>3734</v>
                                 </b>
                                 <b>
                                     <a>1685</a>
@@ -6355,62 +6392,62 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5603</v>
+                                    <v>5602</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>3735</v>
+                                    <v>3734</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>65</b>
-                                    <v>3735</v>
+                                    <v>3734</v>
                                 </b>
                                 <b>
                                     <a>70</a>
                                     <b>100</b>
-                                    <v>3735</v>
+                                    <v>3734</v>
                                 </b>
                                 <b>
                                     <a>100</a>
                                     <b>111</b>
-                                    <v>3735</v>
+                                    <v>3734</v>
                                 </b>
                                 <b>
                                     <a>112</a>
                                     <b>122</b>
-                                    <v>4202</v>
+                                    <v>4201</v>
                                 </b>
                                 <b>
                                     <a>122</a>
                                     <b>140</b>
-                                    <v>3735</v>
+                                    <v>3734</v>
                                 </b>
                                 <b>
                                     <a>143</a>
                                     <b>153</b>
-                                    <v>3735</v>
+                                    <v>3734</v>
                                 </b>
                                 <b>
                                     <a>153</a>
                                     <b>161</b>
-                                    <v>4202</v>
+                                    <v>4201</v>
                                 </b>
                                 <b>
                                     <a>161</a>
                                     <b>173</b>
-                                    <v>4202</v>
+                                    <v>4201</v>
                                 </b>
                                 <b>
                                     <a>173</a>
                                     <b>178</b>
-                                    <v>3735</v>
+                                    <v>3734</v>
                                 </b>
                                 <b>
                                     <a>188</a>
                                     <b>265</b>
-                                    <v>3735</v>
+                                    <v>3734</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6426,62 +6463,62 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5603</v>
+                                    <v>5602</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>8</b>
-                                    <v>3735</v>
+                                    <v>3734</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>105</b>
-                                    <v>3735</v>
+                                    <v>3734</v>
                                 </b>
                                 <b>
                                     <a>155</a>
                                     <b>241</b>
-                                    <v>3735</v>
+                                    <v>3734</v>
                                 </b>
                                 <b>
                                     <a>253</a>
                                     <b>336</b>
-                                    <v>3735</v>
+                                    <v>3734</v>
                                 </b>
                                 <b>
                                     <a>340</a>
                                     <b>426</b>
-                                    <v>3735</v>
+                                    <v>3734</v>
                                 </b>
                                 <b>
                                     <a>434</a>
                                     <b>488</b>
-                                    <v>3735</v>
+                                    <v>3734</v>
                                 </b>
                                 <b>
                                     <a>489</a>
                                     <b>572</b>
-                                    <v>3735</v>
+                                    <v>3734</v>
                                 </b>
                                 <b>
                                     <a>573</a>
                                     <b>623</b>
-                                    <v>3735</v>
+                                    <v>3734</v>
                                 </b>
                                 <b>
                                     <a>626</a>
                                     <b>696</b>
-                                    <v>4202</v>
+                                    <v>4201</v>
                                 </b>
                                 <b>
                                     <a>701</a>
                                     <b>813</b>
-                                    <v>3735</v>
+                                    <v>3734</v>
                                 </b>
                                 <b>
                                     <a>818</a>
                                     <b>1095</b>
-                                    <v>3735</v>
+                                    <v>3734</v>
                                 </b>
                                 <b>
                                     <a>1172</a>
@@ -6507,32 +6544,32 @@
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>3735</v>
+                                    <v>3734</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>8</b>
-                                    <v>4202</v>
+                                    <v>4201</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>15</b>
-                                    <v>3735</v>
+                                    <v>3734</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>23</b>
-                                    <v>3735</v>
+                                    <v>3734</v>
                                 </b>
                                 <b>
                                     <a>23</a>
                                     <b>29</b>
-                                    <v>3735</v>
+                                    <v>3734</v>
                                 </b>
                                 <b>
                                     <a>29</a>
                                     <b>35</b>
-                                    <v>4202</v>
+                                    <v>4201</v>
                                 </b>
                                 <b>
                                     <a>35</a>
@@ -6552,12 +6589,12 @@
                                 <b>
                                     <a>44</a>
                                     <b>46</b>
-                                    <v>3735</v>
+                                    <v>3734</v>
                                 </b>
                                 <b>
                                     <a>46</a>
                                     <b>49</b>
-                                    <v>3735</v>
+                                    <v>3734</v>
                                 </b>
                                 <b>
                                     <a>49</a>
@@ -6578,62 +6615,62 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5603</v>
+                                    <v>5602</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>8</b>
-                                    <v>3735</v>
+                                    <v>3734</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>156</b>
-                                    <v>3735</v>
+                                    <v>3734</v>
                                 </b>
                                 <b>
                                     <a>159</a>
                                     <b>240</b>
-                                    <v>3735</v>
+                                    <v>3734</v>
                                 </b>
                                 <b>
                                     <a>251</a>
                                     <b>335</b>
-                                    <v>3735</v>
+                                    <v>3734</v>
                                 </b>
                                 <b>
                                     <a>342</a>
                                     <b>430</b>
-                                    <v>3735</v>
+                                    <v>3734</v>
                                 </b>
                                 <b>
                                     <a>432</a>
                                     <b>490</b>
-                                    <v>3735</v>
+                                    <v>3734</v>
                                 </b>
                                 <b>
                                     <a>490</a>
                                     <b>573</b>
-                                    <v>3735</v>
+                                    <v>3734</v>
                                 </b>
                                 <b>
                                     <a>574</a>
                                     <b>622</b>
-                                    <v>3735</v>
+                                    <v>3734</v>
                                 </b>
                                 <b>
                                     <a>626</a>
                                     <b>698</b>
-                                    <v>3735</v>
+                                    <v>3734</v>
                                 </b>
                                 <b>
                                     <a>700</a>
                                     <b>798</b>
-                                    <v>3735</v>
+                                    <v>3734</v>
                                 </b>
                                 <b>
                                     <a>811</a>
                                     <b>987</b>
-                                    <v>3735</v>
+                                    <v>3734</v>
                                 </b>
                                 <b>
                                     <a>1096</a>
@@ -10562,23 +10599,23 @@
         </relation>
         <relation>
             <name>numlines</name>
-            <cardinality>1383959</cardinality>
+            <cardinality>1383783</cardinality>
             <columnsizes>
                 <e>
                     <k>element_id</k>
-                    <v>1376955</v>
+                    <v>1376780</v>
                 </e>
                 <e>
                     <k>num_lines</k>
-                    <v>101789</v>
+                    <v>101776</v>
                 </e>
                 <e>
                     <k>num_code</k>
-                    <v>84979</v>
+                    <v>84969</v>
                 </e>
                 <e>
                     <k>num_comment</k>
-                    <v>59766</v>
+                    <v>59758</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -10592,12 +10629,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1369951</v>
+                                    <v>1369777</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>7003</v>
+                                    <v>7002</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10613,7 +10650,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1370885</v>
+                                    <v>1370711</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -10634,7 +10671,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1376955</v>
+                                    <v>1376780</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10650,22 +10687,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>68170</v>
+                                    <v>68162</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>12139</v>
+                                    <v>12138</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>7470</v>
+                                    <v>7469</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>21</b>
-                                    <v>7937</v>
+                                    <v>7936</v>
                                 </b>
                                 <b>
                                     <a>29</a>
@@ -10686,22 +10723,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>70505</v>
+                                    <v>70496</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>12139</v>
+                                    <v>12138</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>8404</v>
+                                    <v>8403</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>9338</v>
+                                    <v>9337</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -10722,17 +10759,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>69571</v>
+                                    <v>69562</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>14941</v>
+                                    <v>14939</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>10739</v>
+                                    <v>10737</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -10753,12 +10790,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>52762</v>
+                                    <v>52755</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>14474</v>
+                                    <v>14472</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -10773,7 +10810,7 @@
                                 <b>
                                     <a>44</a>
                                     <b>922</b>
-                                    <v>4669</v>
+                                    <v>4668</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10789,12 +10826,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>52762</v>
+                                    <v>52755</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>16809</v>
+                                    <v>16807</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -10825,22 +10862,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>53229</v>
+                                    <v>53222</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>15875</v>
+                                    <v>15873</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>7470</v>
+                                    <v>7469</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>5136</v>
+                                    <v>5135</v>
                                 </b>
                                 <b>
                                     <a>7</a>
@@ -10861,27 +10898,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>34552</v>
+                                    <v>34547</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>9338</v>
+                                    <v>9337</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>4202</v>
+                                    <v>4201</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>4669</v>
+                                    <v>4668</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>11</b>
-                                    <v>5136</v>
+                                    <v>5135</v>
                                 </b>
                                 <b>
                                     <a>17</a>
@@ -10902,27 +10939,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>34552</v>
+                                    <v>34547</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>9338</v>
+                                    <v>9337</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>4202</v>
+                                    <v>4201</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>4669</v>
+                                    <v>4668</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>8</b>
-                                    <v>4669</v>
+                                    <v>4668</v>
                                 </b>
                                 <b>
                                     <a>10</a>
@@ -10943,27 +10980,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>34552</v>
+                                    <v>34547</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>9338</v>
+                                    <v>9337</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>4202</v>
+                                    <v>4201</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>4669</v>
+                                    <v>4668</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>10</b>
-                                    <v>4669</v>
+                                    <v>4668</v>
                                 </b>
                                 <b>
                                     <a>10</a>
@@ -11610,15 +11647,15 @@
         </relation>
         <relation>
             <name>files</name>
-            <cardinality>123267</cardinality>
+            <cardinality>123251</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>123267</v>
+                    <v>123251</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>123267</v>
+                    <v>123251</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -11632,7 +11669,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>123267</v>
+                                    <v>123251</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11648,7 +11685,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>123267</v>
+                                    <v>123251</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11658,15 +11695,15 @@
         </relation>
         <relation>
             <name>folders</name>
-            <cardinality>16342</cardinality>
+            <cardinality>16340</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>16342</v>
+                    <v>16340</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>16342</v>
+                    <v>16340</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -11680,7 +11717,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>16342</v>
+                                    <v>16340</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11696,7 +11733,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>16342</v>
+                                    <v>16340</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11706,15 +11743,15 @@
         </relation>
         <relation>
             <name>containerparent</name>
-            <cardinality>138676</cardinality>
+            <cardinality>138658</cardinality>
             <columnsizes>
                 <e>
                     <k>parent</k>
-                    <v>16342</v>
+                    <v>16340</v>
                 </e>
                 <e>
                     <k>child</k>
-                    <v>138676</v>
+                    <v>138658</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -11728,7 +11765,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7470</v>
+                                    <v>7469</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -11769,7 +11806,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>138676</v>
+                                    <v>138658</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11779,7 +11816,7 @@
         </relation>
         <relation>
             <name>fileannotations</name>
-            <cardinality>5129404</cardinality>
+            <cardinality>5129436</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
@@ -12355,11 +12392,11 @@
         </relation>
         <relation>
             <name>inmacroexpansion</name>
-            <cardinality>109779097</cardinality>
+            <cardinality>109779080</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>18027697</v>
+                    <v>18027694</v>
                 </e>
                 <e>
                     <k>inv</k>
@@ -12382,7 +12419,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>1077794</v>
+                                    <v>1077793</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -12392,12 +12429,12 @@
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>4819904</v>
+                                    <v>4819903</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>8</b>
-                                    <v>6385933</v>
+                                    <v>6385932</v>
                                 </b>
                                 <b>
                                     <a>8</a>
@@ -12428,7 +12465,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>544105</v>
+                                    <v>544104</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -12463,7 +12500,7 @@
                                 <b>
                                     <a>11</a>
                                     <b>337</b>
-                                    <v>224845</v>
+                                    <v>224847</v>
                                 </b>
                                 <b>
                                     <a>339</a>
@@ -12483,7 +12520,7 @@
         </relation>
         <relation>
             <name>affectedbymacroexpansion</name>
-            <cardinality>35689256</cardinality>
+            <cardinality>35689251</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
@@ -12566,12 +12603,12 @@
                                 <b>
                                     <a>9</a>
                                     <b>12</b>
-                                    <v>251120</v>
+                                    <v>251119</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>13</b>
-                                    <v>333985</v>
+                                    <v>333984</v>
                                 </b>
                                 <b>
                                     <a>13</a>
@@ -12621,19 +12658,19 @@
         </relation>
         <relation>
             <name>macroinvocations</name>
-            <cardinality>33490802</cardinality>
+            <cardinality>33491008</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>33490802</v>
+                    <v>33491008</v>
                 </e>
                 <e>
                     <k>macro_id</k>
-                    <v>79483</v>
+                    <v>79484</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>760382</v>
+                    <v>760387</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -12651,7 +12688,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>33490802</v>
+                                    <v>33491008</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12667,7 +12704,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>33490802</v>
+                                    <v>33491008</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12683,7 +12720,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>33490802</v>
+                                    <v>33491008</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12765,7 +12802,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>42467</v>
+                                    <v>42468</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -12811,7 +12848,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>73748</v>
+                                    <v>73749</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -12832,22 +12869,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>281223</v>
+                                    <v>281225</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>169657</v>
+                                    <v>169658</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>70734</v>
+                                    <v>70735</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>60326</v>
+                                    <v>60327</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -12883,7 +12920,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>714211</v>
+                                    <v>714216</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -12904,7 +12941,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>760382</v>
+                                    <v>760387</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12977,15 +13014,15 @@
         </relation>
         <relation>
             <name>macroparent</name>
-            <cardinality>29950538</cardinality>
+            <cardinality>29950722</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>29950538</v>
+                    <v>29950722</v>
                 </e>
                 <e>
                     <k>parent_id</k>
-                    <v>23286856</v>
+                    <v>23286998</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -12999,7 +13036,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>29950538</v>
+                                    <v>29950722</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13015,17 +13052,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>17992681</v>
+                                    <v>17992792</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>4459523</v>
+                                    <v>4459550</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>88</b>
-                                    <v>834650</v>
+                                    <v>834655</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13113,11 +13150,11 @@
         </relation>
         <relation>
             <name>macro_argument_unexpanded</name>
-            <cardinality>84548918</cardinality>
+            <cardinality>84549437</cardinality>
             <columnsizes>
                 <e>
                     <k>invocation</k>
-                    <v>26214596</v>
+                    <v>26214757</v>
                 </e>
                 <e>
                     <k>argument_index</k>
@@ -13125,7 +13162,7 @@
                 </e>
                 <e>
                     <k>text</k>
-                    <v>318306</v>
+                    <v>318308</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -13139,22 +13176,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7432418</v>
+                                    <v>7432464</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>10673962</v>
+                                    <v>10674027</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>6139289</v>
+                                    <v>6139327</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>67</b>
-                                    <v>1968925</v>
+                                    <v>1968937</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13170,22 +13207,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7502578</v>
+                                    <v>7502624</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>10820511</v>
+                                    <v>10820578</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>5972962</v>
+                                    <v>5972999</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>67</b>
-                                    <v>1918544</v>
+                                    <v>1918556</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13253,12 +13290,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>35073</v>
+                                    <v>35074</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>61263</v>
+                                    <v>61264</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -13268,12 +13305,12 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>45086</v>
+                                    <v>45087</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>23931</v>
+                                    <v>23932</v>
                                 </b>
                                 <b>
                                     <a>7</a>
@@ -13319,7 +13356,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>230198</v>
+                                    <v>230200</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -13329,7 +13366,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>9</b>
-                                    <v>10283</v>
+                                    <v>10284</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13339,11 +13376,11 @@
         </relation>
         <relation>
             <name>macro_argument_expanded</name>
-            <cardinality>84548918</cardinality>
+            <cardinality>84549437</cardinality>
             <columnsizes>
                 <e>
                     <k>invocation</k>
-                    <v>26214596</v>
+                    <v>26214757</v>
                 </e>
                 <e>
                     <k>argument_index</k>
@@ -13351,7 +13388,7 @@
                 </e>
                 <e>
                     <k>text</k>
-                    <v>192900</v>
+                    <v>192902</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -13365,22 +13402,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7432418</v>
+                                    <v>7432464</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>10673962</v>
+                                    <v>10674027</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>6139289</v>
+                                    <v>6139327</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>67</b>
-                                    <v>1968925</v>
+                                    <v>1968937</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13396,22 +13433,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>10688727</v>
+                                    <v>10688793</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>9201805</v>
+                                    <v>9201862</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>5208245</v>
+                                    <v>5208277</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>9</b>
-                                    <v>1115817</v>
+                                    <v>1115824</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13550,7 +13587,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>97624</v>
+                                    <v>97625</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -13570,15 +13607,15 @@
         </relation>
         <relation>
             <name>functions</name>
-            <cardinality>4179893</cardinality>
+            <cardinality>4179363</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4179893</v>
+                    <v>4179363</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>1895706</v>
+                    <v>1895466</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -13596,7 +13633,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4179893</v>
+                                    <v>4179363</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13612,7 +13649,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4179893</v>
+                                    <v>4179363</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13628,22 +13665,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1498355</v>
+                                    <v>1498165</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>153150</v>
+                                    <v>153131</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>142878</v>
+                                    <v>142860</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>952</b>
-                                    <v>101322</v>
+                                    <v>101309</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13659,7 +13696,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1895240</v>
+                                    <v>1894999</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -13814,15 +13851,15 @@
         </relation>
         <relation>
             <name>function_return_type</name>
-            <cardinality>4185029</cardinality>
+            <cardinality>4184498</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4179893</v>
+                    <v>4179363</v>
                 </e>
                 <e>
                     <k>return_type</k>
-                    <v>818048</v>
+                    <v>817945</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -13836,12 +13873,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4174757</v>
+                                    <v>4174227</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5136</v>
+                                    <v>5135</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13857,22 +13894,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>506144</v>
+                                    <v>506080</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>211516</v>
+                                    <v>211489</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>66303</v>
+                                    <v>66294</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>2231</b>
-                                    <v>34085</v>
+                                    <v>34081</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14163,33 +14200,33 @@
         </relation>
         <relation>
             <name>function_deleted</name>
-            <cardinality>96186</cardinality>
+            <cardinality>96173</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>96186</v>
+                    <v>96173</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>function_defaulted</name>
-            <cardinality>73773</cardinality>
+            <cardinality>73764</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>73773</v>
+                    <v>73764</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>function_prototyped</name>
-            <cardinality>4087910</cardinality>
+            <cardinality>4087391</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4087910</v>
+                    <v>4087391</v>
                 </e>
             </columnsizes>
             <dependencies/>
@@ -14269,15 +14306,15 @@
         </relation>
         <relation>
             <name>member_function_this_type</name>
-            <cardinality>536522</cardinality>
+            <cardinality>536520</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>536522</v>
+                    <v>536520</v>
                 </e>
                 <e>
                     <k>this_type</k>
-                    <v>185332</v>
+                    <v>185331</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -14291,7 +14328,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>536522</v>
+                                    <v>536520</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14307,7 +14344,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>67897</v>
+                                    <v>67896</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -14342,27 +14379,27 @@
         </relation>
         <relation>
             <name>fun_decls</name>
-            <cardinality>4549229</cardinality>
+            <cardinality>4548652</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4544093</v>
+                    <v>4543516</v>
                 </e>
                 <e>
                     <k>function</k>
-                    <v>4036081</v>
+                    <v>4035569</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>816648</v>
+                    <v>816544</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>1798120</v>
+                    <v>1797891</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>3371183</v>
+                    <v>3370755</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -14376,7 +14413,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4544093</v>
+                                    <v>4543516</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14392,12 +14429,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4538957</v>
+                                    <v>4538381</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5136</v>
+                                    <v>5135</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14413,7 +14450,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4544093</v>
+                                    <v>4543516</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14429,7 +14466,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4544093</v>
+                                    <v>4543516</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14445,17 +14482,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3606979</v>
+                                    <v>3606521</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>356262</v>
+                                    <v>356216</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>72839</v>
+                                    <v>72830</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14471,12 +14508,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3996393</v>
+                                    <v>3995885</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>39688</v>
+                                    <v>39683</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14492,7 +14529,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4036081</v>
+                                    <v>4035569</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14508,17 +14545,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3663477</v>
+                                    <v>3663012</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>311904</v>
+                                    <v>311864</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>60699</v>
+                                    <v>60692</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14534,22 +14571,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>431436</v>
+                                    <v>431381</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>274083</v>
+                                    <v>274048</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>63501</v>
+                                    <v>63493</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>2476</b>
-                                    <v>47626</v>
+                                    <v>47620</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14565,22 +14602,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>515482</v>
+                                    <v>515417</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>203111</v>
+                                    <v>203085</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>63034</v>
+                                    <v>63026</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>2192</b>
-                                    <v>35019</v>
+                                    <v>35014</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14596,17 +14633,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>690112</v>
+                                    <v>690024</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>67236</v>
+                                    <v>67228</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>773</b>
-                                    <v>59299</v>
+                                    <v>59291</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14622,22 +14659,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>595326</v>
+                                    <v>595251</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>121399</v>
+                                    <v>121384</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>63501</v>
+                                    <v>63493</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>1959</b>
-                                    <v>36419</v>
+                                    <v>36415</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14653,27 +14690,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1228474</v>
+                                    <v>1228318</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>267079</v>
+                                    <v>267045</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>77976</v>
+                                    <v>77966</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>146146</v>
+                                    <v>146128</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>986</b>
-                                    <v>78443</v>
+                                    <v>78433</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14689,22 +14726,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1407772</v>
+                                    <v>1407593</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>152216</v>
+                                    <v>152197</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>136808</v>
+                                    <v>136791</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>936</b>
-                                    <v>101322</v>
+                                    <v>101309</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14720,17 +14757,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1579600</v>
+                                    <v>1579399</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>134940</v>
+                                    <v>134923</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>562</b>
-                                    <v>83579</v>
+                                    <v>83568</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14746,27 +14783,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1236411</v>
+                                    <v>1236254</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>293227</v>
+                                    <v>293190</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>78909</v>
+                                    <v>78899</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>8</b>
-                                    <v>137275</v>
+                                    <v>137257</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>542</b>
-                                    <v>52295</v>
+                                    <v>52288</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14782,17 +14819,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2966828</v>
+                                    <v>2966451</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>277819</v>
+                                    <v>277783</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>55</b>
-                                    <v>126536</v>
+                                    <v>126520</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14808,17 +14845,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3034065</v>
+                                    <v>3033679</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>7</b>
-                                    <v>244200</v>
+                                    <v>244169</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>55</b>
-                                    <v>92917</v>
+                                    <v>92905</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14834,12 +14871,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3207760</v>
+                                    <v>3207353</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>18</b>
-                                    <v>163423</v>
+                                    <v>163402</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14855,12 +14892,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3232974</v>
+                                    <v>3232563</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>13</b>
-                                    <v>138209</v>
+                                    <v>138191</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14870,22 +14907,22 @@
         </relation>
         <relation>
             <name>fun_def</name>
-            <cardinality>1889170</cardinality>
+            <cardinality>1888930</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1889170</v>
+                    <v>1888930</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>fun_specialized</name>
-            <cardinality>26147</cardinality>
+            <cardinality>26144</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>26147</v>
+                    <v>26144</v>
                 </e>
             </columnsizes>
             <dependencies/>
@@ -14903,11 +14940,11 @@
         </relation>
         <relation>
             <name>fun_decl_specifiers</name>
-            <cardinality>2907062</cardinality>
+            <cardinality>2906692</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1689793</v>
+                    <v>1689579</v>
                 </e>
                 <e>
                     <k>name</k>
@@ -14925,17 +14962,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>491202</v>
+                                    <v>491140</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1179914</v>
+                                    <v>1179764</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>18676</v>
+                                    <v>18674</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15107,11 +15144,11 @@
         </relation>
         <relation>
             <name>fun_decl_empty_throws</name>
-            <cardinality>1472207</cardinality>
+            <cardinality>1472021</cardinality>
             <columnsizes>
                 <e>
                     <k>fun_decl</k>
-                    <v>1472207</v>
+                    <v>1472021</v>
                 </e>
             </columnsizes>
             <dependencies/>
@@ -15171,11 +15208,11 @@
         </relation>
         <relation>
             <name>fun_decl_empty_noexcept</name>
-            <cardinality>863340</cardinality>
+            <cardinality>863230</cardinality>
             <columnsizes>
                 <e>
                     <k>fun_decl</k>
-                    <v>863340</v>
+                    <v>863230</v>
                 </e>
             </columnsizes>
             <dependencies/>
@@ -15280,19 +15317,19 @@
         </relation>
         <relation>
             <name>param_decl_bind</name>
-            <cardinality>6995905</cardinality>
+            <cardinality>6995017</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>6995905</v>
+                    <v>6995017</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>7937</v>
+                    <v>7936</v>
                 </e>
                 <e>
                     <k>fun_decl</k>
-                    <v>3835771</v>
+                    <v>3835284</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -15306,7 +15343,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6995905</v>
+                                    <v>6995017</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15322,7 +15359,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6995905</v>
+                                    <v>6995017</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15500,22 +15537,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1974150</v>
+                                    <v>1973899</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1061782</v>
+                                    <v>1061647</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>502875</v>
+                                    <v>502812</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>8</b>
-                                    <v>290892</v>
+                                    <v>290856</v>
                                 </b>
                                 <b>
                                     <a>8</a>
@@ -15536,22 +15573,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1974150</v>
+                                    <v>1973899</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1061782</v>
+                                    <v>1061647</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>502875</v>
+                                    <v>502812</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>8</b>
-                                    <v>290892</v>
+                                    <v>290856</v>
                                 </b>
                                 <b>
                                     <a>8</a>
@@ -15566,27 +15603,27 @@
         </relation>
         <relation>
             <name>var_decls</name>
-            <cardinality>8111384</cardinality>
+            <cardinality>8110354</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>8040412</v>
+                    <v>8039391</v>
                 </e>
                 <e>
                     <k>variable</k>
-                    <v>7028123</v>
+                    <v>7027231</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>2043721</v>
+                    <v>2043462</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>667699</v>
+                    <v>667614</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>5312648</v>
+                    <v>5311974</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -15600,7 +15637,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8040412</v>
+                                    <v>8039391</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15616,12 +15653,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7972241</v>
+                                    <v>7971229</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>68170</v>
+                                    <v>68162</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15637,7 +15674,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8040412</v>
+                                    <v>8039391</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15653,7 +15690,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8037610</v>
+                                    <v>8036590</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -15674,17 +15711,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6175989</v>
+                                    <v>6175205</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>698516</v>
+                                    <v>698427</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>153617</v>
+                                    <v>153598</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15700,12 +15737,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6856762</v>
+                                    <v>6855892</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>171360</v>
+                                    <v>171338</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15721,12 +15758,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6912793</v>
+                                    <v>6911916</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>115329</v>
+                                    <v>115315</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15742,12 +15779,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6482757</v>
+                                    <v>6481934</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>543031</v>
+                                    <v>542962</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -15768,27 +15805,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1165906</v>
+                                    <v>1165758</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>477195</v>
+                                    <v>477134</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>94785</v>
+                                    <v>94773</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>184901</v>
+                                    <v>184877</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>762</b>
-                                    <v>120933</v>
+                                    <v>120917</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15804,22 +15841,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1299446</v>
+                                    <v>1299281</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>452448</v>
+                                    <v>452390</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>155952</v>
+                                    <v>155932</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>724</b>
-                                    <v>135874</v>
+                                    <v>135857</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15835,17 +15872,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1539444</v>
+                                    <v>1539249</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>383343</v>
+                                    <v>383295</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>128</b>
-                                    <v>120933</v>
+                                    <v>120917</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15861,22 +15898,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1365749</v>
+                                    <v>1365576</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>404355</v>
+                                    <v>404303</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>173228</v>
+                                    <v>173206</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>592</b>
-                                    <v>100388</v>
+                                    <v>100375</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15892,37 +15929,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>341320</v>
+                                    <v>341277</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>86847</v>
+                                    <v>86836</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>48559</v>
+                                    <v>48553</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>51828</v>
+                                    <v>51821</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>12</b>
-                                    <v>52295</v>
+                                    <v>52288</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>33</b>
-                                    <v>50427</v>
+                                    <v>50421</v>
                                 </b>
                                 <b>
                                     <a>34</a>
                                     <b>2384</b>
-                                    <v>36419</v>
+                                    <v>36415</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15938,37 +15975,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>368869</v>
+                                    <v>368822</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>77976</v>
+                                    <v>77966</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>45291</v>
+                                    <v>45285</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>49493</v>
+                                    <v>49487</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>14</b>
-                                    <v>53229</v>
+                                    <v>53222</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>56</b>
-                                    <v>50894</v>
+                                    <v>50888</v>
                                 </b>
                                 <b>
                                     <a>56</a>
                                     <b>2301</b>
-                                    <v>21945</v>
+                                    <v>21942</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15984,27 +16021,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>457117</v>
+                                    <v>457059</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>93851</v>
+                                    <v>93839</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>46692</v>
+                                    <v>46686</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>19</b>
-                                    <v>50894</v>
+                                    <v>50888</v>
                                 </b>
                                 <b>
                                     <a>19</a>
                                     <b>1182</b>
-                                    <v>19143</v>
+                                    <v>19141</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16020,32 +16057,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>379141</v>
+                                    <v>379093</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>90583</v>
+                                    <v>90571</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>59766</v>
+                                    <v>59758</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>9</b>
-                                    <v>51361</v>
+                                    <v>51354</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>21</b>
-                                    <v>50427</v>
+                                    <v>50421</v>
                                 </b>
                                 <b>
                                     <a>21</a>
                                     <b>1010</b>
-                                    <v>36419</v>
+                                    <v>36415</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16061,17 +16098,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4496934</v>
+                                    <v>4496363</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>531825</v>
+                                    <v>531757</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>896</b>
-                                    <v>283889</v>
+                                    <v>283853</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16087,17 +16124,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4886348</v>
+                                    <v>4885727</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>17</b>
-                                    <v>415561</v>
+                                    <v>415508</v>
                                 </b>
                                 <b>
                                     <a>17</a>
                                     <b>892</b>
-                                    <v>10739</v>
+                                    <v>10737</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16113,12 +16150,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4962456</v>
+                                    <v>4961826</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>759</b>
-                                    <v>350192</v>
+                                    <v>350147</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16134,12 +16171,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5303310</v>
+                                    <v>5302637</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>6</b>
-                                    <v>9338</v>
+                                    <v>9337</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16149,22 +16186,22 @@
         </relation>
         <relation>
             <name>var_def</name>
-            <cardinality>3995459</cardinality>
+            <cardinality>3994952</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>3995459</v>
+                    <v>3994952</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>var_decl_specifiers</name>
-            <cardinality>378674</cardinality>
+            <cardinality>378626</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>378674</v>
+                    <v>378626</v>
                 </e>
                 <e>
                     <k>name</k>
@@ -16182,7 +16219,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>378674</v>
+                                    <v>378626</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16234,19 +16271,19 @@
         </relation>
         <relation>
             <name>type_decls</name>
-            <cardinality>3283868</cardinality>
+            <cardinality>3283451</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>3283868</v>
+                    <v>3283451</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>3233441</v>
+                    <v>3233030</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>3166671</v>
+                    <v>3166269</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -16260,7 +16297,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3283868</v>
+                                    <v>3283451</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16276,7 +16313,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3283868</v>
+                                    <v>3283451</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16292,12 +16329,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3191884</v>
+                                    <v>3191479</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>41556</v>
+                                    <v>41550</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16313,12 +16350,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3191884</v>
+                                    <v>3191479</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>41556</v>
+                                    <v>41550</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16334,12 +16371,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3114375</v>
+                                    <v>3113980</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>20</b>
-                                    <v>52295</v>
+                                    <v>52288</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16355,12 +16392,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3114375</v>
+                                    <v>3113980</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>20</b>
-                                    <v>52295</v>
+                                    <v>52288</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16370,22 +16407,22 @@
         </relation>
         <relation>
             <name>type_def</name>
-            <cardinality>2642316</cardinality>
+            <cardinality>2641981</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>2642316</v>
+                    <v>2641981</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>type_decl_top</name>
-            <cardinality>743808</cardinality>
+            <cardinality>743713</cardinality>
             <columnsizes>
                 <e>
                     <k>type_decl</k>
-                    <v>743808</v>
+                    <v>743713</v>
                 </e>
             </columnsizes>
             <dependencies/>
@@ -16758,19 +16795,19 @@
         </relation>
         <relation>
             <name>usings</name>
-            <cardinality>369802</cardinality>
+            <cardinality>369755</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>369802</v>
+                    <v>369755</v>
                 </e>
                 <e>
                     <k>element_id</k>
-                    <v>315639</v>
+                    <v>315599</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>247936</v>
+                    <v>247904</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -16788,7 +16825,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>369802</v>
+                                    <v>369755</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16804,7 +16841,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>369802</v>
+                                    <v>369755</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16820,7 +16857,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>369802</v>
+                                    <v>369755</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16836,12 +16873,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>263344</v>
+                                    <v>263311</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>50894</v>
+                                    <v>50888</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -16862,12 +16899,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>263344</v>
+                                    <v>263311</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>50894</v>
+                                    <v>50888</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -16888,7 +16925,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>315639</v>
+                                    <v>315599</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16904,17 +16941,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>202644</v>
+                                    <v>202618</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>10739</v>
+                                    <v>10737</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>31283</v>
+                                    <v>31279</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -16935,17 +16972,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>202644</v>
+                                    <v>202618</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>10739</v>
+                                    <v>10737</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>31283</v>
+                                    <v>31279</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -16966,7 +17003,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>247936</v>
+                                    <v>247904</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17039,7 +17076,7 @@
         </relation>
         <relation>
             <name>using_container</name>
-            <cardinality>466798</cardinality>
+            <cardinality>466800</cardinality>
             <columnsizes>
                 <e>
                     <k>parent</k>
@@ -17047,7 +17084,7 @@
                 </e>
                 <e>
                     <k>child</k>
-                    <v>295989</v>
+                    <v>295990</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -17117,12 +17154,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>218311</v>
+                                    <v>218313</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>51724</v>
+                                    <v>51725</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -17750,23 +17787,23 @@
         </relation>
         <relation>
             <name>params</name>
-            <cardinality>6355287</cardinality>
+            <cardinality>6354480</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>6191397</v>
+                    <v>6190611</v>
                 </e>
                 <e>
                     <k>function</k>
-                    <v>3492116</v>
+                    <v>3491673</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>7937</v>
+                    <v>7936</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>1846680</v>
+                    <v>1846445</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -17780,7 +17817,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6191397</v>
+                                    <v>6190611</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17796,7 +17833,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6191397</v>
+                                    <v>6190611</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17812,12 +17849,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6067663</v>
+                                    <v>6066892</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>123734</v>
+                                    <v>123718</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17833,22 +17870,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1867691</v>
+                                    <v>1867454</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>952989</v>
+                                    <v>952868</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>430035</v>
+                                    <v>429981</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>18</b>
-                                    <v>241399</v>
+                                    <v>241368</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17864,22 +17901,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1867691</v>
+                                    <v>1867454</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>952989</v>
+                                    <v>952868</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>430035</v>
+                                    <v>429981</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>18</b>
-                                    <v>241399</v>
+                                    <v>241368</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17895,22 +17932,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2166055</v>
+                                    <v>2165780</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>826920</v>
+                                    <v>826815</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>346456</v>
+                                    <v>346412</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>12</b>
-                                    <v>152683</v>
+                                    <v>152664</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18164,22 +18201,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1184116</v>
+                                    <v>1183966</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>406222</v>
+                                    <v>406171</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>154084</v>
+                                    <v>154064</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>518</b>
-                                    <v>102256</v>
+                                    <v>102243</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18195,22 +18232,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1404971</v>
+                                    <v>1404792</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>212449</v>
+                                    <v>212422</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>147547</v>
+                                    <v>147528</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>502</b>
-                                    <v>81711</v>
+                                    <v>81701</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18226,17 +18263,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1420379</v>
+                                    <v>1420199</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>347390</v>
+                                    <v>347346</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>13</b>
-                                    <v>78909</v>
+                                    <v>78899</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18676,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>
@@ -18688,7 +18725,7 @@
                 </e>
                 <e>
                     <k>name</k>
-                    <v>90548</v>
+                    <v>90547</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -18702,7 +18739,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>576946</v>
+                                    <v>576945</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18718,7 +18755,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>576946</v>
+                                    <v>576945</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18739,7 +18776,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5362</v>
+                                    <v>5366</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -18749,7 +18786,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>3380</v>
+                                    <v>3376</v>
                                 </b>
                                 <b>
                                     <a>7</a>
@@ -18775,7 +18812,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26908</v>
+                                    <v>26912</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -18785,7 +18822,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>2918</v>
+                                    <v>2914</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -18816,7 +18853,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>14285</v>
+                                    <v>14284</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -18847,7 +18884,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>76492</v>
+                                    <v>76491</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -18943,7 +18980,7 @@
                 </e>
                 <e>
                     <k>function</k>
-                    <v>32886</v>
+                    <v>32885</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -19885,19 +19922,19 @@
         </relation>
         <relation>
             <name>builtintypes</name>
-            <cardinality>26147</cardinality>
+            <cardinality>26144</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>26147</v>
+                    <v>26144</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>26147</v>
+                    <v>26144</v>
                 </e>
                 <e>
                     <k>kind</k>
-                    <v>26147</v>
+                    <v>26144</v>
                 </e>
                 <e>
                     <k>size</k>
@@ -19923,7 +19960,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26147</v>
+                                    <v>26144</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19939,7 +19976,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26147</v>
+                                    <v>26144</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19955,7 +19992,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26147</v>
+                                    <v>26144</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19971,7 +20008,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26147</v>
+                                    <v>26144</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19987,7 +20024,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26147</v>
+                                    <v>26144</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20003,7 +20040,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26147</v>
+                                    <v>26144</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20019,7 +20056,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26147</v>
+                                    <v>26144</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20035,7 +20072,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26147</v>
+                                    <v>26144</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20051,7 +20088,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26147</v>
+                                    <v>26144</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20067,7 +20104,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26147</v>
+                                    <v>26144</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20083,7 +20120,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26147</v>
+                                    <v>26144</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20099,7 +20136,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26147</v>
+                                    <v>26144</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20115,7 +20152,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26147</v>
+                                    <v>26144</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20131,7 +20168,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26147</v>
+                                    <v>26144</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20147,7 +20184,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26147</v>
+                                    <v>26144</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20592,15 +20629,15 @@
         </relation>
         <relation>
             <name>derivedtypes</name>
-            <cardinality>3670014</cardinality>
+            <cardinality>3669548</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>3670014</v>
+                    <v>3669548</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>1552985</v>
+                    <v>1552788</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -20608,7 +20645,7 @@
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>2363096</v>
+                    <v>2362796</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -20622,7 +20659,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3670014</v>
+                                    <v>3669548</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20638,7 +20675,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3670014</v>
+                                    <v>3669548</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20654,7 +20691,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3670014</v>
+                                    <v>3669548</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20670,17 +20707,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1324193</v>
+                                    <v>1324025</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>120466</v>
+                                    <v>120450</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>1153</b>
-                                    <v>108326</v>
+                                    <v>108312</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20696,7 +20733,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1552051</v>
+                                    <v>1551854</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -20717,17 +20754,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1324193</v>
+                                    <v>1324025</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>120466</v>
+                                    <v>120450</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>1135</b>
-                                    <v>108326</v>
+                                    <v>108312</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20866,22 +20903,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1515631</v>
+                                    <v>1515439</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>546299</v>
+                                    <v>546230</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>218519</v>
+                                    <v>218492</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>72</b>
-                                    <v>82645</v>
+                                    <v>82634</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20897,22 +20934,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1526837</v>
+                                    <v>1526644</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>538829</v>
+                                    <v>538760</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>215718</v>
+                                    <v>215690</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>72</b>
-                                    <v>81711</v>
+                                    <v>81701</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20928,22 +20965,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1519834</v>
+                                    <v>1519641</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>550035</v>
+                                    <v>549965</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>217586</v>
+                                    <v>217558</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>75641</v>
+                                    <v>75631</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20953,11 +20990,11 @@
         </relation>
         <relation>
             <name>pointerishsize</name>
-            <cardinality>2707685</cardinality>
+            <cardinality>2707342</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>2707685</v>
+                    <v>2707342</v>
                 </e>
                 <e>
                     <k>size</k>
@@ -20979,7 +21016,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2707685</v>
+                                    <v>2707342</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20995,7 +21032,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2707685</v>
+                                    <v>2707342</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21069,19 +21106,19 @@
         </relation>
         <relation>
             <name>arraysizes</name>
-            <cardinality>88248</cardinality>
+            <cardinality>88237</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>88248</v>
+                    <v>88237</v>
                 </e>
                 <e>
                     <k>num_elements</k>
-                    <v>31750</v>
+                    <v>31746</v>
                 </e>
                 <e>
                     <k>bytesize</k>
-                    <v>33151</v>
+                    <v>33147</v>
                 </e>
                 <e>
                     <k>alignment</k>
@@ -21099,7 +21136,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>88248</v>
+                                    <v>88237</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21115,7 +21152,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>88248</v>
+                                    <v>88237</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21131,7 +21168,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>88248</v>
+                                    <v>88237</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21152,7 +21189,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>23813</v>
+                                    <v>23810</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -21183,7 +21220,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26614</v>
+                                    <v>26611</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -21209,7 +21246,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26614</v>
+                                    <v>26611</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -21240,7 +21277,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>23813</v>
+                                    <v>23810</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -21271,12 +21308,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>27548</v>
+                                    <v>27544</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3735</v>
+                                    <v>3734</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -21297,12 +21334,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>27548</v>
+                                    <v>27544</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>4669</v>
+                                    <v>4668</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -21405,15 +21442,15 @@
         </relation>
         <relation>
             <name>typedefbase</name>
-            <cardinality>1686099</cardinality>
+            <cardinality>1686109</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1686099</v>
+                    <v>1686109</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>793481</v>
+                    <v>793485</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -21427,7 +21464,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1686099</v>
+                                    <v>1686109</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21443,12 +21480,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>617400</v>
+                                    <v>617404</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>83253</v>
+                                    <v>83254</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -21754,19 +21791,19 @@
         </relation>
         <relation>
             <name>usertypes</name>
-            <cardinality>5235606</cardinality>
+            <cardinality>5234008</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>5235606</v>
+                    <v>5234008</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>1352675</v>
+                    <v>1352503</v>
                 </e>
                 <e>
                     <k>kind</k>
-                    <v>5136</v>
+                    <v>5135</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -21780,7 +21817,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5235606</v>
+                                    <v>5234008</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21796,7 +21833,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5235606</v>
+                                    <v>5234008</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21812,27 +21849,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>983806</v>
+                                    <v>983681</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>153617</v>
+                                    <v>153598</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>104590</v>
+                                    <v>104577</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>61</b>
-                                    <v>101789</v>
+                                    <v>101776</v>
                                 </b>
                                 <b>
                                     <a>65</a>
                                     <b>874</b>
-                                    <v>8871</v>
+                                    <v>8870</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21848,17 +21885,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1212131</v>
+                                    <v>1211977</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>125135</v>
+                                    <v>125586</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>15408</v>
+                                    <v>14939</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21892,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>
@@ -21958,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>
@@ -22000,15 +22037,15 @@
         </relation>
         <relation>
             <name>usertypesize</name>
-            <cardinality>1707537</cardinality>
+            <cardinality>1706386</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1707537</v>
+                    <v>1706386</v>
                 </e>
                 <e>
                     <k>size</k>
-                    <v>13540</v>
+                    <v>13539</v>
                 </e>
                 <e>
                     <k>alignment</k>
@@ -22026,7 +22063,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1707537</v>
+                                    <v>1706386</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22042,7 +22079,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1707537</v>
+                                    <v>1706386</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22063,7 +22100,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>4202</v>
+                                    <v>4201</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -22097,7 +22134,7 @@
                                 </b>
                                 <b>
                                     <a>740</a>
-                                    <b>2472</b>
+                                    <b>2470</b>
                                     <v>933</v>
                                 </b>
                             </bs>
@@ -22114,7 +22151,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>10272</v>
+                                    <v>10270</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -22158,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>
@@ -22270,15 +22307,15 @@
         </relation>
         <relation>
             <name>mangled_name</name>
-            <cardinality>9021417</cardinality>
+            <cardinality>9019338</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>9021417</v>
+                    <v>9019338</v>
                 </e>
                 <e>
                     <k>mangled_name</k>
-                    <v>6062526</v>
+                    <v>6061757</v>
                 </e>
                 <e>
                     <k>is_complete</k>
@@ -22296,7 +22333,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9021417</v>
+                                    <v>9019338</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22312,7 +22349,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9021417</v>
+                                    <v>9019338</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22328,12 +22365,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5789844</v>
+                                    <v>5789108</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>874</b>
-                                    <v>272682</v>
+                                    <v>272648</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22349,7 +22386,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6062526</v>
+                                    <v>6061757</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22363,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>
@@ -22391,59 +22428,59 @@
         </relation>
         <relation>
             <name>is_pod_class</name>
-            <cardinality>534710</cardinality>
+            <cardinality>534713</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>534710</v>
+                    <v>534713</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>is_standard_layout_class</name>
-            <cardinality>1255088</cardinality>
+            <cardinality>1253995</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1255088</v>
+                    <v>1253995</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>is_complete</name>
-            <cardinality>1646837</cardinality>
+            <cardinality>1645694</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1646837</v>
+                    <v>1645694</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>is_class_template</name>
-            <cardinality>398285</cardinality>
+            <cardinality>398234</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>398285</v>
+                    <v>398234</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>class_instantiation</name>
-            <cardinality>1089798</cardinality>
+            <cardinality>1089659</cardinality>
             <columnsizes>
                 <e>
                     <k>to</k>
-                    <v>1089798</v>
+                    <v>1089659</v>
                 </e>
                 <e>
                     <k>from</k>
-                    <v>168559</v>
+                    <v>168537</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -22457,7 +22494,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1089798</v>
+                                    <v>1089659</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22473,42 +22510,42 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>59766</v>
+                                    <v>59758</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>29416</v>
+                                    <v>29412</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>15875</v>
+                                    <v>15873</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>13073</v>
+                                    <v>13072</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>9805</v>
+                                    <v>9804</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>10</b>
-                                    <v>12606</v>
+                                    <v>12605</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>16</b>
-                                    <v>13073</v>
+                                    <v>13072</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>70</b>
-                                    <v>13540</v>
+                                    <v>13539</v>
                                 </b>
                                 <b>
                                     <a>70</a>
@@ -22523,11 +22560,11 @@
         </relation>
         <relation>
             <name>class_template_argument</name>
-            <cardinality>2882732</cardinality>
+            <cardinality>2882750</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>1315503</v>
+                    <v>1315511</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -22535,7 +22572,7 @@
                 </e>
                 <e>
                     <k>arg_type</k>
-                    <v>840385</v>
+                    <v>840390</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -22549,22 +22586,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>540953</v>
+                                    <v>540956</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>399235</v>
+                                    <v>399237</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>231395</v>
+                                    <v>231396</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>120314</v>
+                                    <v>120315</v>
                                 </b>
                                 <b>
                                     <a>7</a>
@@ -22585,17 +22622,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>567605</v>
+                                    <v>567609</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>410478</v>
+                                    <v>410481</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>244840</v>
+                                    <v>244841</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -22708,17 +22745,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>523343</v>
+                                    <v>523346</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>174342</v>
+                                    <v>174343</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>51340</v>
+                                    <v>51341</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -22744,7 +22781,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>746486</v>
+                                    <v>746490</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -22764,11 +22801,11 @@
         </relation>
         <relation>
             <name>class_template_argument_value</name>
-            <cardinality>495405</cardinality>
+            <cardinality>495342</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>304900</v>
+                    <v>304861</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -22776,7 +22813,7 @@
                 </e>
                 <e>
                     <k>arg_value</k>
-                    <v>495405</v>
+                    <v>495342</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -22790,12 +22827,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>249803</v>
+                                    <v>249772</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>53229</v>
+                                    <v>53222</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -22816,22 +22853,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>189570</v>
+                                    <v>189546</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>81244</v>
+                                    <v>81234</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>12139</v>
+                                    <v>12138</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>9</b>
-                                    <v>21945</v>
+                                    <v>21942</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22909,7 +22946,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>495405</v>
+                                    <v>495342</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22925,7 +22962,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>495405</v>
+                                    <v>495342</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22935,15 +22972,15 @@
         </relation>
         <relation>
             <name>is_proxy_class_for</name>
-            <cardinality>63034</cardinality>
+            <cardinality>62092</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>63034</v>
+                    <v>62092</v>
                 </e>
                 <e>
                     <k>templ_param_id</k>
-                    <v>63034</v>
+                    <v>62092</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -22957,7 +22994,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>63034</v>
+                                    <v>62092</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22973,7 +23010,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>63034</v>
+                                    <v>62092</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23279,22 +23316,22 @@
         </relation>
         <relation>
             <name>is_function_template</name>
-            <cardinality>1403103</cardinality>
+            <cardinality>1402925</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1403103</v>
+                    <v>1402925</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>function_instantiation</name>
-            <cardinality>894819</cardinality>
+            <cardinality>894816</cardinality>
             <columnsizes>
                 <e>
                     <k>to</k>
-                    <v>894819</v>
+                    <v>894816</v>
                 </e>
                 <e>
                     <k>from</k>
@@ -23312,7 +23349,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>894819</v>
+                                    <v>894816</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23328,7 +23365,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>100156</v>
+                                    <v>100155</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -23358,11 +23395,11 @@
         </relation>
         <relation>
             <name>function_template_argument</name>
-            <cardinality>2313481</cardinality>
+            <cardinality>2313473</cardinality>
             <columnsizes>
                 <e>
                     <k>function_id</k>
-                    <v>1321571</v>
+                    <v>1321566</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -23370,7 +23407,7 @@
                 </e>
                 <e>
                     <k>arg_type</k>
-                    <v>301234</v>
+                    <v>301233</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -23384,17 +23421,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>674407</v>
+                                    <v>674404</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>390486</v>
+                                    <v>390485</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>186795</v>
+                                    <v>186794</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -23415,17 +23452,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>691825</v>
+                                    <v>691822</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>400275</v>
+                                    <v>400274</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>166868</v>
+                                    <v>166867</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -23609,7 +23646,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>271727</v>
+                                    <v>271726</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -23629,11 +23666,11 @@
         </relation>
         <relation>
             <name>function_template_argument_value</name>
-            <cardinality>358993</cardinality>
+            <cardinality>358992</cardinality>
             <columnsizes>
                 <e>
                     <k>function_id</k>
-                    <v>192752</v>
+                    <v>192751</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -23641,7 +23678,7 @@
                 </e>
                 <e>
                     <k>arg_value</k>
-                    <v>356381</v>
+                    <v>356379</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -23676,7 +23713,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>176135</v>
+                                    <v>176134</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -23814,7 +23851,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>353768</v>
+                                    <v>353767</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -23835,7 +23872,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>356381</v>
+                                    <v>356379</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24356,15 +24393,15 @@
         </relation>
         <relation>
             <name>routinetypes</name>
-            <cardinality>538891</cardinality>
+            <cardinality>538889</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>538891</v>
+                    <v>538889</v>
                 </e>
                 <e>
                     <k>return_type</k>
-                    <v>280750</v>
+                    <v>280749</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -24378,7 +24415,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>538891</v>
+                                    <v>538889</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24394,7 +24431,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>244450</v>
+                                    <v>244449</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -24414,19 +24451,19 @@
         </relation>
         <relation>
             <name>routinetypeargs</name>
-            <cardinality>983339</cardinality>
+            <cardinality>983214</cardinality>
             <columnsizes>
                 <e>
                     <k>routine</k>
-                    <v>423499</v>
+                    <v>423445</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>7937</v>
+                    <v>7936</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>226924</v>
+                    <v>226895</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -24440,27 +24477,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>152683</v>
+                                    <v>152664</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>134006</v>
+                                    <v>133989</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>63501</v>
+                                    <v>63493</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>45758</v>
+                                    <v>45752</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>18</b>
-                                    <v>27548</v>
+                                    <v>27544</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24476,27 +24513,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>182566</v>
+                                    <v>182543</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>133539</v>
+                                    <v>133522</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>58832</v>
+                                    <v>58824</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>33618</v>
+                                    <v>33614</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>11</b>
-                                    <v>14941</v>
+                                    <v>14939</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24654,27 +24691,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>146613</v>
+                                    <v>146595</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>30816</v>
+                                    <v>30812</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>16809</v>
+                                    <v>16807</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>12</b>
-                                    <v>18209</v>
+                                    <v>18207</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>110</b>
-                                    <v>14474</v>
+                                    <v>14472</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24690,22 +24727,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>172761</v>
+                                    <v>172739</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>30816</v>
+                                    <v>30812</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>18676</v>
+                                    <v>18674</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>14</b>
-                                    <v>4669</v>
+                                    <v>4668</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24715,19 +24752,19 @@
         </relation>
         <relation>
             <name>ptrtomembers</name>
-            <cardinality>37820</cardinality>
+            <cardinality>37815</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>37820</v>
+                    <v>37815</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>37820</v>
+                    <v>37815</v>
                 </e>
                 <e>
                     <k>class_id</k>
-                    <v>15408</v>
+                    <v>15406</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -24741,7 +24778,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>37820</v>
+                                    <v>37815</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24757,7 +24794,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>37820</v>
+                                    <v>37815</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24773,7 +24810,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>37820</v>
+                                    <v>37815</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24789,7 +24826,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>37820</v>
+                                    <v>37815</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24805,7 +24842,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13540</v>
+                                    <v>13539</v>
                                 </b>
                                 <b>
                                     <a>8</a>
@@ -24831,7 +24868,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13540</v>
+                                    <v>13539</v>
                                 </b>
                                 <b>
                                     <a>8</a>
@@ -24851,15 +24888,15 @@
         </relation>
         <relation>
             <name>specifiers</name>
-            <cardinality>24746</cardinality>
+            <cardinality>24743</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>24746</v>
+                    <v>24743</v>
                 </e>
                 <e>
                     <k>str</k>
-                    <v>24746</v>
+                    <v>24743</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -24873,7 +24910,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>24746</v>
+                                    <v>24743</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24889,7 +24926,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>24746</v>
+                                    <v>24743</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24899,15 +24936,15 @@
         </relation>
         <relation>
             <name>typespecifiers</name>
-            <cardinality>1133221</cardinality>
+            <cardinality>1132144</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>1115011</v>
+                    <v>1113936</v>
                 </e>
                 <e>
                     <k>spec_id</k>
-                    <v>3735</v>
+                    <v>3734</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -24921,12 +24958,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1096801</v>
+                                    <v>1095728</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>18209</v>
+                                    <v>18207</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24967,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>
@@ -24987,15 +25019,15 @@
         </relation>
         <relation>
             <name>funspecifiers</name>
-            <cardinality>10305922</cardinality>
+            <cardinality>10305080</cardinality>
             <columnsizes>
                 <e>
                     <k>func_id</k>
-                    <v>4068766</v>
+                    <v>4068249</v>
                 </e>
                 <e>
                     <k>spec_id</k>
-                    <v>8404</v>
+                    <v>8403</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -25009,27 +25041,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1357811</v>
+                                    <v>1357639</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>641085</v>
+                                    <v>640536</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>985207</v>
+                                    <v>985549</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>780228</v>
+                                    <v>780129</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>8</b>
-                                    <v>304433</v>
+                                    <v>304395</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25128,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>
@@ -25140,15 +25172,15 @@
         </relation>
         <relation>
             <name>varspecifiers</name>
-            <cardinality>2246366</cardinality>
+            <cardinality>2246080</cardinality>
             <columnsizes>
                 <e>
                     <k>var_id</k>
-                    <v>1225205</v>
+                    <v>1225050</v>
                 </e>
                 <e>
                     <k>spec_id</k>
-                    <v>3735</v>
+                    <v>3734</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -25162,22 +25194,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>730267</v>
+                                    <v>730174</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>202644</v>
+                                    <v>202618</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>58365</v>
+                                    <v>58357</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>233928</v>
+                                    <v>233898</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25286,11 +25318,11 @@
         </relation>
         <relation>
             <name>attributes</name>
-            <cardinality>561708</cardinality>
+            <cardinality>561636</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>561708</v>
+                    <v>561636</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -25298,7 +25330,7 @@
                 </e>
                 <e>
                     <k>name</k>
-                    <v>11206</v>
+                    <v>11204</v>
                 </e>
                 <e>
                     <k>name_space</k>
@@ -25306,7 +25338,7 @@
                 </e>
                 <e>
                     <k>location</k>
-                    <v>481397</v>
+                    <v>481336</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -25320,7 +25352,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>561708</v>
+                                    <v>561636</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25336,7 +25368,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>561708</v>
+                                    <v>561636</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25352,7 +25384,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>561708</v>
+                                    <v>561636</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25368,7 +25400,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>561708</v>
+                                    <v>561636</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25559,7 +25591,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>10272</v>
+                                    <v>10270</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -25580,7 +25612,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11206</v>
+                                    <v>11204</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25751,17 +25783,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>431903</v>
+                                    <v>431848</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>20077</v>
+                                    <v>20075</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>29416</v>
+                                    <v>29412</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25777,7 +25809,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>481397</v>
+                                    <v>481336</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25793,17 +25825,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>433304</v>
+                                    <v>433249</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>19610</v>
+                                    <v>19608</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>28482</v>
+                                    <v>28478</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25819,7 +25851,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>481397</v>
+                                    <v>481336</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25829,11 +25861,11 @@
         </relation>
         <relation>
             <name>attribute_args</name>
-            <cardinality>344122</cardinality>
+            <cardinality>344078</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>344122</v>
+                    <v>344078</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -25841,7 +25873,7 @@
                 </e>
                 <e>
                     <k>attribute</k>
-                    <v>262877</v>
+                    <v>262844</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -25849,7 +25881,7 @@
                 </e>
                 <e>
                     <k>location</k>
-                    <v>327779</v>
+                    <v>327738</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -25863,7 +25895,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>344122</v>
+                                    <v>344078</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25879,7 +25911,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>344122</v>
+                                    <v>344078</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25895,7 +25927,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>344122</v>
+                                    <v>344078</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25911,7 +25943,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>344122</v>
+                                    <v>344078</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26026,17 +26058,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>197508</v>
+                                    <v>197483</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>49493</v>
+                                    <v>49487</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>15875</v>
+                                    <v>15873</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26052,12 +26084,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>252605</v>
+                                    <v>252573</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>10272</v>
+                                    <v>10270</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26073,17 +26105,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>197508</v>
+                                    <v>197483</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>49493</v>
+                                    <v>49487</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>15875</v>
+                                    <v>15873</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26099,17 +26131,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>197508</v>
+                                    <v>197483</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>49493</v>
+                                    <v>49487</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>15875</v>
+                                    <v>15873</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26224,12 +26256,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>313772</v>
+                                    <v>313732</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>7</b>
-                                    <v>14007</v>
+                                    <v>14005</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26245,12 +26277,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>315172</v>
+                                    <v>315132</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>12606</v>
+                                    <v>12605</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26266,12 +26298,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>313772</v>
+                                    <v>313732</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>7</b>
-                                    <v>14007</v>
+                                    <v>14005</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26287,7 +26319,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>327779</v>
+                                    <v>327738</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26297,15 +26329,15 @@
         </relation>
         <relation>
             <name>attribute_arg_value</name>
-            <cardinality>25213</cardinality>
+            <cardinality>25210</cardinality>
             <columnsizes>
                 <e>
                     <k>arg</k>
-                    <v>25213</v>
+                    <v>25210</v>
                 </e>
                 <e>
                     <k>value</k>
-                    <v>15875</v>
+                    <v>15873</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26319,7 +26351,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>25213</v>
+                                    <v>25210</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26335,7 +26367,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>14474</v>
+                                    <v>14472</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -26398,15 +26430,15 @@
         </relation>
         <relation>
             <name>attribute_arg_constant</name>
-            <cardinality>318441</cardinality>
+            <cardinality>318400</cardinality>
             <columnsizes>
                 <e>
                     <k>arg</k>
-                    <v>318441</v>
+                    <v>318400</v>
                 </e>
                 <e>
                     <k>constant</k>
-                    <v>318441</v>
+                    <v>318400</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26420,7 +26452,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>318441</v>
+                                    <v>318400</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26436,7 +26468,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>318441</v>
+                                    <v>318400</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26615,15 +26647,15 @@
         </relation>
         <relation>
             <name>funcattributes</name>
-            <cardinality>630345</cardinality>
+            <cardinality>630265</cardinality>
             <columnsizes>
                 <e>
                     <k>func_id</k>
-                    <v>443576</v>
+                    <v>443520</v>
                 </e>
                 <e>
                     <k>spec_id</k>
-                    <v>524821</v>
+                    <v>524754</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26637,17 +26669,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>338519</v>
+                                    <v>338476</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>64435</v>
+                                    <v>64427</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>39688</v>
+                                    <v>39683</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -26668,12 +26700,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>506144</v>
+                                    <v>506080</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>17</b>
-                                    <v>18676</v>
+                                    <v>18674</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26809,15 +26841,15 @@
         </relation>
         <relation>
             <name>unspecifiedtype</name>
-            <cardinality>9490208</cardinality>
+            <cardinality>9488069</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>9490208</v>
+                    <v>9488069</v>
                 </e>
                 <e>
                     <k>unspecified_type_id</k>
-                    <v>6492096</v>
+                    <v>6490338</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26831,7 +26863,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9490208</v>
+                                    <v>9488069</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26847,17 +26879,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4560436</v>
+                                    <v>4558923</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1715941</v>
+                                    <v>1715723</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>145</b>
-                                    <v>215718</v>
+                                    <v>215690</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26867,19 +26899,19 @@
         </relation>
         <relation>
             <name>member</name>
-            <cardinality>3881530</cardinality>
+            <cardinality>3881037</cardinality>
             <columnsizes>
                 <e>
                     <k>parent</k>
-                    <v>545832</v>
+                    <v>545763</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>92917</v>
+                    <v>92905</v>
                 </e>
                 <e>
                     <k>child</k>
-                    <v>3810090</v>
+                    <v>3809607</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26893,47 +26925,47 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>129804</v>
+                                    <v>129788</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>64902</v>
+                                    <v>64894</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>73306</v>
+                                    <v>73297</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>75174</v>
+                                    <v>75165</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>40622</v>
+                                    <v>40617</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>8</b>
-                                    <v>46692</v>
+                                    <v>46686</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>14</b>
-                                    <v>45758</v>
+                                    <v>45752</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>30</b>
-                                    <v>41556</v>
+                                    <v>41550</v>
                                 </b>
                                 <b>
                                     <a>30</a>
                                     <b>200</b>
-                                    <v>28015</v>
+                                    <v>28011</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26949,52 +26981,52 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>129804</v>
+                                    <v>129788</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>64902</v>
+                                    <v>64894</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>73306</v>
+                                    <v>73297</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>76108</v>
+                                    <v>76098</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>39688</v>
+                                    <v>39683</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>24279</v>
+                                    <v>24276</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>9</b>
-                                    <v>42023</v>
+                                    <v>42017</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>17</b>
-                                    <v>43890</v>
+                                    <v>43885</v>
                                 </b>
                                 <b>
                                     <a>17</a>
                                     <b>41</b>
-                                    <v>41556</v>
+                                    <v>41550</v>
                                 </b>
                                 <b>
                                     <a>41</a>
                                     <b>200</b>
-                                    <v>10272</v>
+                                    <v>10270</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27010,57 +27042,57 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26147</v>
+                                    <v>26144</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>7003</v>
+                                    <v>7002</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>3735</v>
+                                    <v>3734</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>7937</v>
+                                    <v>7936</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>5603</v>
+                                    <v>5602</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>5603</v>
+                                    <v>5602</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>9</b>
-                                    <v>7470</v>
+                                    <v>7469</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>16</b>
-                                    <v>7003</v>
+                                    <v>7002</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>52</b>
-                                    <v>7003</v>
+                                    <v>7002</v>
                                 </b>
                                 <b>
                                     <a>52</a>
                                     <b>107</b>
-                                    <v>7003</v>
+                                    <v>7002</v>
                                 </b>
                                 <b>
                                     <a>108</a>
                                     <b>577</b>
-                                    <v>7003</v>
+                                    <v>7002</v>
                                 </b>
                                 <b>
                                     <a>737</a>
@@ -27081,57 +27113,57 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26147</v>
+                                    <v>26144</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>7003</v>
+                                    <v>7002</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>3735</v>
+                                    <v>3734</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>7937</v>
+                                    <v>7936</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>5603</v>
+                                    <v>5602</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>5603</v>
+                                    <v>5602</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>9</b>
-                                    <v>7470</v>
+                                    <v>7469</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>16</b>
-                                    <v>7003</v>
+                                    <v>7002</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>52</b>
-                                    <v>7003</v>
+                                    <v>7002</v>
                                 </b>
                                 <b>
                                     <a>52</a>
                                     <b>107</b>
-                                    <v>7003</v>
+                                    <v>7002</v>
                                 </b>
                                 <b>
                                     <a>108</a>
                                     <b>577</b>
-                                    <v>7003</v>
+                                    <v>7002</v>
                                 </b>
                                 <b>
                                     <a>738</a>
@@ -27152,7 +27184,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3810090</v>
+                                    <v>3809607</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27168,12 +27200,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3738651</v>
+                                    <v>3738177</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>71439</v>
+                                    <v>71430</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27183,11 +27215,11 @@
         </relation>
         <relation>
             <name>enclosingfunction</name>
-            <cardinality>118327</cardinality>
+            <cardinality>118328</cardinality>
             <columnsizes>
                 <e>
                     <k>child</k>
-                    <v>118327</v>
+                    <v>118328</v>
                 </e>
                 <e>
                     <k>parent</k>
@@ -27205,7 +27237,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>118327</v>
+                                    <v>118328</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27236,7 +27268,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>45</b>
-                                    <v>4887</v>
+                                    <v>4888</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27246,15 +27278,15 @@
         </relation>
         <relation>
             <name>derivations</name>
-            <cardinality>391566</cardinality>
+            <cardinality>391564</cardinality>
             <columnsizes>
                 <e>
                     <k>derivation</k>
-                    <v>391566</v>
+                    <v>391564</v>
                 </e>
                 <e>
                     <k>sub</k>
-                    <v>371291</v>
+                    <v>371289</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -27262,7 +27294,7 @@
                 </e>
                 <e>
                     <k>super</k>
-                    <v>202750</v>
+                    <v>202749</v>
                 </e>
                 <e>
                     <k>location</k>
@@ -27280,7 +27312,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>391566</v>
+                                    <v>391564</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27296,7 +27328,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>391566</v>
+                                    <v>391564</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27312,7 +27344,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>391566</v>
+                                    <v>391564</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27328,7 +27360,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>391566</v>
+                                    <v>391564</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27344,7 +27376,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>356311</v>
+                                    <v>356310</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -27365,7 +27397,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>356311</v>
+                                    <v>356310</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -27386,7 +27418,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>356311</v>
+                                    <v>356310</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -27407,7 +27439,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>356311</v>
+                                    <v>356310</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -27557,7 +27589,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>195365</v>
+                                    <v>195364</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -27578,7 +27610,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>195365</v>
+                                    <v>195364</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -27599,7 +27631,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>202297</v>
+                                    <v>202296</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -27620,7 +27652,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>199092</v>
+                                    <v>199091</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -27754,11 +27786,11 @@
         </relation>
         <relation>
             <name>derspecifiers</name>
-            <cardinality>393447</cardinality>
+            <cardinality>393446</cardinality>
             <columnsizes>
                 <e>
                     <k>der_id</k>
-                    <v>391183</v>
+                    <v>391181</v>
                 </e>
                 <e>
                     <k>spec_id</k>
@@ -27776,7 +27808,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>388918</v>
+                                    <v>388917</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -27822,11 +27854,11 @@
         </relation>
         <relation>
             <name>direct_base_offsets</name>
-            <cardinality>362617</cardinality>
+            <cardinality>362615</cardinality>
             <columnsizes>
                 <e>
                     <k>der_id</k>
-                    <v>362617</v>
+                    <v>362615</v>
                 </e>
                 <e>
                     <k>offset</k>
@@ -27844,7 +27876,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>362617</v>
+                                    <v>362615</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28186,11 +28218,11 @@
         </relation>
         <relation>
             <name>frienddecls</name>
-            <cardinality>707049</cardinality>
+            <cardinality>707046</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>707049</v>
+                    <v>707046</v>
                 </e>
                 <e>
                     <k>type_id</k>
@@ -28198,7 +28230,7 @@
                 </e>
                 <e>
                     <k>decl_id</k>
-                    <v>69395</v>
+                    <v>69394</v>
                 </e>
                 <e>
                     <k>location</k>
@@ -28216,7 +28248,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>707049</v>
+                                    <v>707046</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28232,7 +28264,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>707049</v>
+                                    <v>707046</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28248,7 +28280,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>707049</v>
+                                    <v>707046</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28489,7 +28521,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>68733</v>
+                                    <v>68732</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -28703,15 +28735,15 @@
         </relation>
         <relation>
             <name>commentbinding</name>
-            <cardinality>3091496</cardinality>
+            <cardinality>3091104</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>2445742</v>
+                    <v>2445431</v>
                 </e>
                 <e>
                     <k>element</k>
-                    <v>3014921</v>
+                    <v>3014538</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -28725,12 +28757,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2368699</v>
+                                    <v>2368399</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>97</b>
-                                    <v>77042</v>
+                                    <v>77032</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28746,12 +28778,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2938345</v>
+                                    <v>2937972</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>76575</v>
+                                    <v>76565</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28761,15 +28793,15 @@
         </relation>
         <relation>
             <name>exprconv</name>
-            <cardinality>7032992</cardinality>
+            <cardinality>7032991</cardinality>
             <columnsizes>
                 <e>
                     <k>converted</k>
-                    <v>7032992</v>
+                    <v>7032991</v>
                 </e>
                 <e>
                     <k>conversion</k>
-                    <v>7032992</v>
+                    <v>7032991</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -28783,7 +28815,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7032992</v>
+                                    <v>7032991</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28799,7 +28831,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7032992</v>
+                                    <v>7032991</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28809,11 +28841,11 @@
         </relation>
         <relation>
             <name>compgenerated</name>
-            <cardinality>7908039</cardinality>
+            <cardinality>7908009</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>7908039</v>
+                    <v>7908009</v>
                 </e>
             </columnsizes>
             <dependencies/>
@@ -29156,15 +29188,15 @@
         </relation>
         <relation>
             <name>namespaces</name>
-            <cardinality>12139</cardinality>
+            <cardinality>12138</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>12139</v>
+                    <v>12138</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>9805</v>
+                    <v>9804</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -29178,7 +29210,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>12139</v>
+                                    <v>12138</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29194,7 +29226,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8404</v>
+                                    <v>8403</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -29225,15 +29257,15 @@
         </relation>
         <relation>
             <name>namespacembrs</name>
-            <cardinality>2388310</cardinality>
+            <cardinality>2388007</cardinality>
             <columnsizes>
                 <e>
                     <k>parentid</k>
-                    <v>10272</v>
+                    <v>10270</v>
                 </e>
                 <e>
                     <k>memberid</k>
-                    <v>2388310</v>
+                    <v>2388007</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -29308,7 +29340,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2388310</v>
+                                    <v>2388007</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29666,11 +29698,11 @@
         </relation>
         <relation>
             <name>numtemplatearguments</name>
-            <cardinality>393830</cardinality>
+            <cardinality>393829</cardinality>
             <columnsizes>
                 <e>
                     <k>expr_id</k>
-                    <v>393830</v>
+                    <v>393829</v>
                 </e>
                 <e>
                     <k>num</k>
@@ -29688,7 +29720,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>393830</v>
+                                    <v>393829</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30229,7 +30261,7 @@
                 </e>
                 <e>
                     <k>fun</k>
-                    <v>511323</v>
+                    <v>511342</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -30264,12 +30296,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>315050</v>
+                                    <v>315088</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>77912</v>
+                                    <v>77893</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -32053,11 +32085,11 @@
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>18319782</v>
+                    <v>18319781</v>
                 </e>
                 <e>
                     <k>typeid</k>
-                    <v>1214616</v>
+                    <v>1214623</v>
                 </e>
                 <e>
                     <k>value_category</k>
@@ -32075,12 +32107,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>18188122</v>
+                                    <v>18188121</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>131659</v>
+                                    <v>131660</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32096,7 +32128,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>18319782</v>
+                                    <v>18319781</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32112,17 +32144,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>438565</v>
+                                    <v>438567</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>249332</v>
+                                    <v>249334</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>102839</v>
+                                    <v>102840</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -32132,12 +32164,12 @@
                                 <b>
                                     <a>5</a>
                                     <b>8</b>
-                                    <v>109274</v>
+                                    <v>109275</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>14</b>
-                                    <v>96495</v>
+                                    <v>96496</v>
                                 </b>
                                 <b>
                                     <a>14</a>
@@ -32147,7 +32179,7 @@
                                 <b>
                                     <a>41</a>
                                     <b>125325</b>
-                                    <v>44578</v>
+                                    <v>44579</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32163,7 +32195,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1050230</v>
+                                    <v>1050237</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -32197,8 +32229,8 @@
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>1239489</a>
-                                    <b>1239490</b>
+                                    <a>1239479</a>
+                                    <b>1239480</b>
                                     <v>11</v>
                                 </b>
                             </bs>
@@ -32233,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>
@@ -33663,11 +33706,11 @@
         </relation>
         <relation>
             <name>lambdas</name>
-            <cardinality>21478</cardinality>
+            <cardinality>21475</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>21478</v>
+                    <v>21475</v>
                 </e>
                 <e>
                     <k>default_capture</k>
@@ -33689,7 +33732,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>21478</v>
+                                    <v>21475</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33705,7 +33748,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>21478</v>
+                                    <v>21475</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33779,15 +33822,15 @@
         </relation>
         <relation>
             <name>lambda_capture</name>
-            <cardinality>28015</cardinality>
+            <cardinality>28011</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>28015</v>
+                    <v>28011</v>
                 </e>
                 <e>
                     <k>lambda</k>
-                    <v>20544</v>
+                    <v>20541</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -33795,7 +33838,7 @@
                 </e>
                 <e>
                     <k>field</k>
-                    <v>28015</v>
+                    <v>28011</v>
                 </e>
                 <e>
                     <k>captured_by_reference</k>
@@ -33821,7 +33864,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28015</v>
+                                    <v>28011</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33837,7 +33880,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28015</v>
+                                    <v>28011</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33853,7 +33896,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28015</v>
+                                    <v>28011</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33869,7 +33912,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28015</v>
+                                    <v>28011</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33885,7 +33928,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28015</v>
+                                    <v>28011</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33901,7 +33944,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28015</v>
+                                    <v>28011</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33917,12 +33960,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13073</v>
+                                    <v>13072</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>7470</v>
+                                    <v>7469</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33938,12 +33981,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13073</v>
+                                    <v>13072</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>7470</v>
+                                    <v>7469</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33959,12 +34002,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13073</v>
+                                    <v>13072</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>7470</v>
+                                    <v>7469</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33980,7 +34023,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>20544</v>
+                                    <v>20541</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33996,7 +34039,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>20544</v>
+                                    <v>20541</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34012,12 +34055,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13073</v>
+                                    <v>13072</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>7470</v>
+                                    <v>7469</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34149,7 +34192,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28015</v>
+                                    <v>28011</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34165,7 +34208,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28015</v>
+                                    <v>28011</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34181,7 +34224,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28015</v>
+                                    <v>28011</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34197,7 +34240,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28015</v>
+                                    <v>28011</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34213,7 +34256,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28015</v>
+                                    <v>28011</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34229,7 +34272,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28015</v>
+                                    <v>28011</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36275,11 +36318,11 @@
         </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>
@@ -36287,7 +36330,7 @@
                 </e>
                 <e>
                     <k>decl</k>
-                    <v>580739</v>
+                    <v>580738</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -36301,7 +36344,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>520373</v>
+                                    <v>520371</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -36322,7 +36365,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>520373</v>
+                                    <v>520371</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -36525,7 +36568,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>580702</v>
+                                    <v>580700</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -36546,7 +36589,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>580739</v>
+                                    <v>580738</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36556,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>
@@ -36568,7 +36611,7 @@
                 </e>
                 <e>
                     <k>decl_entry</k>
-                    <v>580785</v>
+                    <v>580784</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -36582,7 +36625,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>520373</v>
+                                    <v>520371</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -36603,7 +36646,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>520373</v>
+                                    <v>520371</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -36806,7 +36849,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>580764</v>
+                                    <v>580763</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -36827,7 +36870,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>580785</v>
+                                    <v>580784</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37076,19 +37119,19 @@
         </relation>
         <relation>
             <name>preprocdirects</name>
-            <cardinality>4191099</cardinality>
+            <cardinality>4190567</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4191099</v>
+                    <v>4190567</v>
                 </e>
                 <e>
                     <k>kind</k>
-                    <v>5136</v>
+                    <v>5135</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>4150477</v>
+                    <v>4149950</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -37102,7 +37145,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4191099</v>
+                                    <v>4190567</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37118,7 +37161,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4191099</v>
+                                    <v>4190567</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37266,7 +37309,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4150010</v>
+                                    <v>4149483</v>
                                 </b>
                                 <b>
                                     <a>88</a>
@@ -37287,7 +37330,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4150477</v>
+                                    <v>4149950</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37297,15 +37340,15 @@
         </relation>
         <relation>
             <name>preprocpair</name>
-            <cardinality>1431585</cardinality>
+            <cardinality>1431403</cardinality>
             <columnsizes>
                 <e>
                     <k>begin</k>
-                    <v>1197190</v>
+                    <v>1197038</v>
                 </e>
                 <e>
                     <k>elseelifend</k>
-                    <v>1431585</v>
+                    <v>1431403</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -37319,17 +37362,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>978670</v>
+                                    <v>978546</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>208247</v>
+                                    <v>208221</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>11</b>
-                                    <v>10272</v>
+                                    <v>10270</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37345,7 +37388,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1431585</v>
+                                    <v>1431403</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37355,22 +37398,22 @@
         </relation>
         <relation>
             <name>preproctrue</name>
-            <cardinality>767154</cardinality>
+            <cardinality>767056</cardinality>
             <columnsizes>
                 <e>
                     <k>branch</k>
-                    <v>767154</v>
+                    <v>767056</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>preprocfalse</name>
-            <cardinality>331515</cardinality>
+            <cardinality>331473</cardinality>
             <columnsizes>
                 <e>
                     <k>branch</k>
-                    <v>331515</v>
+                    <v>331473</v>
                 </e>
             </columnsizes>
             <dependencies/>
@@ -37523,15 +37566,15 @@
         </relation>
         <relation>
             <name>includes</name>
-            <cardinality>313305</cardinality>
+            <cardinality>313265</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>313305</v>
+                    <v>313265</v>
                 </e>
                 <e>
                     <k>included</k>
-                    <v>117197</v>
+                    <v>117182</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -37545,7 +37588,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>313305</v>
+                                    <v>313265</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37561,27 +37604,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>61166</v>
+                                    <v>61159</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>21945</v>
+                                    <v>21942</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>12606</v>
+                                    <v>12605</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>10272</v>
+                                    <v>10270</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>14</b>
-                                    <v>8871</v>
+                                    <v>8870</v>
                                 </b>
                                 <b>
                                     <a>14</a>
@@ -37644,11 +37687,11 @@
         </relation>
         <relation>
             <name>link_parent</name>
-            <cardinality>28676738</cardinality>
+            <cardinality>28682586</cardinality>
             <columnsizes>
                 <e>
                     <k>element</k>
-                    <v>3584435</v>
+                    <v>3585083</v>
                 </e>
                 <e>
                     <k>link_target</k>
@@ -37666,7 +37709,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>432952</v>
+                                    <v>432951</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -37676,7 +37719,7 @@
                                 <b>
                                     <a>9</a>
                                     <b>10</b>
-                                    <v>3131138</v>
+                                    <v>3131788</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37695,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/src/CHANGELOG.md b/cpp/ql/src/CHANGELOG.md
index e73850bbfe9..4098bcf4d20 100644
--- a/cpp/ql/src/CHANGELOG.md
+++ b/cpp/ql/src/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 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
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/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 40355f0807f..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.5
+lastReleaseVersion: 1.2.6
diff --git a/cpp/ql/src/qlpack.yml b/cpp/ql/src/qlpack.yml
index eee6e064b22..a3d0c48a99c 100644
--- a/cpp/ql/src/qlpack.yml
+++ b/cpp/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/cpp-queries
-version: 1.2.5
+version: 1.2.6
 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/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/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/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/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/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/ir/ir/PrintAST.expected b/cpp/ql/test/library-tests/ir/ir/PrintAST.expected
index 510d13fdfa2..7e8df845de1 100644
--- a/cpp/ql/test/library-tests/ir/ir/PrintAST.expected
+++ b/cpp/ql/test/library-tests/ir/ir/PrintAST.expected
@@ -23585,10 +23585,26 @@ ir.cpp:
 # 2692|       getDeclarationEntry(0): [VariableDeclarationEntry] definition of y
 # 2692|           Type = [IntType] int
 # 2692|         getVariable().getInitializer(): [Initializer] initializer for y
-#-----|           getExpr(): [RequiresExpr] requires ...
+#-----|           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
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_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_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/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/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/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/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/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/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/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/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/ql/campaigns/Solorigate/lib/CHANGELOG.md b/csharp/ql/campaigns/Solorigate/lib/CHANGELOG.md
index eb646b9ce77..7b5cb257096 100644
--- a/csharp/ql/campaigns/Solorigate/lib/CHANGELOG.md
+++ b/csharp/ql/campaigns/Solorigate/lib/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.7.28
+
+No user-facing changes.
+
 ## 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 5c0490dbda8..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.27
+lastReleaseVersion: 1.7.28
diff --git a/csharp/ql/campaigns/Solorigate/lib/qlpack.yml b/csharp/ql/campaigns/Solorigate/lib/qlpack.yml
index e02f2f0733c..aaa2fcab60d 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.27
+version: 1.7.28
 groups:
   - csharp
   - solorigate
diff --git a/csharp/ql/campaigns/Solorigate/src/CHANGELOG.md b/csharp/ql/campaigns/Solorigate/src/CHANGELOG.md
index eb646b9ce77..7b5cb257096 100644
--- a/csharp/ql/campaigns/Solorigate/src/CHANGELOG.md
+++ b/csharp/ql/campaigns/Solorigate/src/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.7.28
+
+No user-facing changes.
+
 ## 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 5c0490dbda8..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.27
+lastReleaseVersion: 1.7.28
diff --git a/csharp/ql/campaigns/Solorigate/src/qlpack.yml b/csharp/ql/campaigns/Solorigate/src/qlpack.yml
index d94e11459d4..d36ab3c819f 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.27
+version: 1.7.28
 groups:
   - csharp
   - solorigate
diff --git a/csharp/ql/lib/CHANGELOG.md b/csharp/ql/lib/CHANGELOG.md
index 302087e4f14..39a75db1b5f 100644
--- a/csharp/ql/lib/CHANGELOG.md
+++ b/csharp/ql/lib/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 3.1.0
+
+### Major Analysis Improvements
+
+* The generated .NET 8 runtime models have been updated.
+
 ## 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 e3b15d965db..82f62960aa3 100644
--- a/csharp/ql/lib/codeql-pack.release.yml
+++ b/csharp/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 3.0.1
+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..620e283d32d 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"]
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..613d5028022 100644
--- a/csharp/ql/lib/ext/generated/Internal.TypeSystem.Ecma.model.yml
+++ b/csharp/ql/lib/ext/generated/Internal.TypeSystem.Ecma.model.yml
@@ -4,29 +4,30 @@ 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"]
@@ -38,15 +39,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 +71,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"]
@@ -149,6 +159,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..60863caec90 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"]
@@ -427,6 +431,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 +445,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 +479,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 +536,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 +544,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 +765,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 +822,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.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..41f7b4a6cb1 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,28 @@ 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", "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
@@ -29,8 +39,6 @@ extensions:
       - ["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.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..e93e5288845 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,45 +4,37 @@ 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, "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, "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, "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
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..84e199349b8 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,25 +4,28 @@ 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"]
@@ -61,7 +64,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..b566c2ee225 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"]
   - 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", "XmlConfigurationSource", "Build", "(Microsoft.Extensions.Configuration.IConfigurationBuilder)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Configuration.Xml", "XmlDocumentDecryptor", "DecryptDocumentAndCreateXmlReader", "(System.Xml.XmlDocument)", "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..22ef85f5472 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,68 @@ 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", "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", "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.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, "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.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.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.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 +73,44 @@ 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.String,System.Object)", "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 +119,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..1b5bdbc0693 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,23 +4,23 @@ 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
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..463cfa95558 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
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..d851831061e 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,23 @@ 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<THandler>", "(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder)", "", "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, "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, "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", "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 +29,62 @@ 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", "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", "MemoryCacheServiceCollectionExtensions", False, "AddDistributedMemoryCache", "(Microsoft.Extensions.DependencyInjection.IServiceCollection)", "", "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", "MetricsServiceExtensions", False, "AddMetrics", "(Microsoft.Extensions.DependencyInjection.IServiceCollection)", "", "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", "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,System.String,Microsoft.Extensions.Configuration.IConfiguration)", "", "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, "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", "ServiceCollectionHostedServiceExtensions", False, "AddHostedService<THostedService>", "(Microsoft.Extensions.DependencyInjection.IServiceCollection)", "", "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.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>", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object)", "", "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.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>", "(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,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.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>", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object)", "", "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.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>", "(Microsoft.Extensions.DependencyInjection.IServiceCollection)", "", "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.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>", "(Microsoft.Extensions.DependencyInjection.IServiceCollection)", "", "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.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>", "(Microsoft.Extensions.DependencyInjection.IServiceCollection)", "", "Argument[0]", "ReturnValue", "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>", "(System.Object,TService)", "", "Argument[1]", "ReturnValue.SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationInstance]", "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, "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_ImplementationInstance", "()", "", "Argument[this].SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationInstance]", "ReturnValue", "value", "dfc-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, "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"]
   - addsTo:
       pack: codeql/csharp-all
       extensible: neutralModel
@@ -160,6 +156,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..0908db395e1 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,13 +4,15 @@ 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
@@ -36,7 +38,6 @@ 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"]
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..d4afcce0844 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,10 @@ 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"]
+      - ["Microsoft.Extensions.FileSystemGlobbing", "MatcherExtensions", False, "GetResultsInFullPath", "(Microsoft.Extensions.FileSystemGlobbing.Matcher,System.String)", "", "Argument[1]", "ReturnValue.Element", "taint", "dfc-generated"]
   - addsTo:
       pack: codeql/csharp-all
       extensible: neutralModel
@@ -21,7 +23,6 @@ extensions:
       - ["Microsoft.Extensions.FileSystemGlobbing", "Matcher", "Matcher", "(System.StringComparison)", "summary", "df-generated"]
       - ["Microsoft.Extensions.FileSystemGlobbing", "MatcherExtensions", "AddExcludePatterns", "(Microsoft.Extensions.FileSystemGlobbing.Matcher,System.Collections.Generic.IEnumerable<System.String>[])", "summary", "df-generated"]
       - ["Microsoft.Extensions.FileSystemGlobbing", "MatcherExtensions", "AddIncludePatterns", "(Microsoft.Extensions.FileSystemGlobbing.Matcher,System.Collections.Generic.IEnumerable<System.String>[])", "summary", "df-generated"]
-      - ["Microsoft.Extensions.FileSystemGlobbing", "MatcherExtensions", "GetResultsInFullPath", "(Microsoft.Extensions.FileSystemGlobbing.Matcher,System.String)", "summary", "df-generated"]
       - ["Microsoft.Extensions.FileSystemGlobbing", "MatcherExtensions", "Match", "(Microsoft.Extensions.FileSystemGlobbing.Matcher,System.Collections.Generic.IEnumerable<System.String>)", "summary", "df-generated"]
       - ["Microsoft.Extensions.FileSystemGlobbing", "MatcherExtensions", "Match", "(Microsoft.Extensions.FileSystemGlobbing.Matcher,System.String)", "summary", "df-generated"]
       - ["Microsoft.Extensions.FileSystemGlobbing", "MatcherExtensions", "Match", "(Microsoft.Extensions.FileSystemGlobbing.Matcher,System.String,System.Collections.Generic.IEnumerable<System.String>)", "summary", "df-generated"]
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..47319aa926c 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,16 @@ 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, "ConfigureDefaults", "(Microsoft.Extensions.Hosting.IHostBuilder,System.String[])", "", "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, "UseContentRoot", "(Microsoft.Extensions.Hosting.IHostBuilder,System.String)", "", "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 +23,13 @@ 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, "UseServiceProviderFactory<TContainerBuilder>", "(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, "UseWindowsService", "(Microsoft.Extensions.Hosting.IHostBuilder)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/csharp-all
       extensible: neutralModel
@@ -40,6 +38,7 @@ 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"]
@@ -73,6 +72,7 @@ extensions:
       - ["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", "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..f95d08e7f97 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
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..c0bc86ec28f 100644
--- a/csharp/ql/lib/ext/generated/Microsoft.Extensions.Logging.model.yml
+++ b/csharp/ql/lib/ext/generated/Microsoft.Extensions.Logging.model.yml
@@ -4,32 +4,32 @@ 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.ILoggingBuilder)", "", "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, "AddJsonConsole", "(Microsoft.Extensions.Logging.ILoggingBuilder)", "", "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, "AddSystemdConsole", "(Microsoft.Extensions.Logging.ILoggingBuilder)", "", "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.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", "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.String,Microsoft.Extensions.Logging.LogLevel)", "", "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<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.LoggerFilterOptions,System.String,Microsoft.Extensions.Logging.LogLevel)", "", "Argument[0]", "ReturnValue", "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"]
@@ -48,18 +48,18 @@ 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, "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
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..6f3300d4c5f 100644
--- a/csharp/ql/lib/ext/generated/Microsoft.Extensions.Options.model.yml
+++ b/csharp/ql/lib/ext/generated/Microsoft.Extensions.Options.model.yml
@@ -12,6 +12,7 @@ extensions:
       - ["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", "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"]
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..5db46715654 100644
--- a/csharp/ql/lib/ext/generated/Microsoft.Extensions.Primitives.model.yml
+++ b/csharp/ql/lib/ext/generated/Microsoft.Extensions.Primitives.model.yml
@@ -5,22 +5,22 @@ 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", "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
@@ -38,6 +38,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 +59,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 +84,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..63f25678ae2 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,13 @@ 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"]
   - addsTo:
       pack: codeql/csharp-all
       extensible: neutralModel
diff --git a/csharp/ql/lib/ext/generated/Microsoft.Interop.model.yml b/csharp/ql/lib/ext/generated/Microsoft.Interop.model.yml
index 07d5d071b61..1b7ebad2b05 100644
--- a/csharp/ql/lib/ext/generated/Microsoft.Interop.model.yml
+++ b/csharp/ql/lib/ext/generated/Microsoft.Interop.model.yml
@@ -10,60 +10,71 @@ extensions:
       - ["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", "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", "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", "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,52 +84,56 @@ 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", "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", "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[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", "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
@@ -272,6 +287,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"]
@@ -306,6 +322,7 @@ extensions:
       - ["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"]
@@ -464,6 +481,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 +576,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"]
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..ac9e70477b2 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,13 @@ 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", "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/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..e31e94b889b 100644
--- a/csharp/ql/lib/ext/generated/Mono.Linker.Steps.model.yml
+++ b/csharp/ql/lib/ext/generated/Mono.Linker.Steps.model.yml
@@ -4,35 +4,35 @@ 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"]
@@ -40,11 +40,14 @@ extensions:
       - ["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 +62,29 @@ 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", "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 +135,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"]
@@ -155,6 +159,7 @@ extensions:
       - ["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 +199,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 +210,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 +242,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..d2d52eb2755 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,45 +206,62 @@ 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", "get_ReturnTypeCustomAttributes", "()", "summary", "df-generated"]
@@ -306,52 +270,71 @@ extensions:
       - ["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", "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", "get_TypeParameters", "()", "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..fb065263d80 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,18 @@ 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, "GetOrAdd", "(TKey,TValue)", "", "Argument[1]", "ReturnValue", "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 +107,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..ace22bbd68c 100644
--- a/csharp/ql/lib/ext/generated/System.Collections.Frozen.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Collections.Frozen.model.yml
@@ -5,13 +5,15 @@ 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
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..faab2ee0929 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,91 @@ 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[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,6 +152,7 @@ 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"]
@@ -308,6 +318,7 @@ 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>", "RemoveAt", "(System.Int32)", "summary", "df-generated"]
       - ["System.Collections.Generic", "List<T>", "RemoveRange", "(System.Int32,System.Int32)", "summary", "df-generated"]
@@ -447,6 +458,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"]
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..88be4ce6118 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,90 @@ 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, "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, "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, "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, "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, "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, "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, "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, "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[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, "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, "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.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, "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]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableArray<T>", False, "Sort", "(System.Int32,System.Int32,System.Collections.Generic.IComparer<T>)", "", "Argument[this]", "ReturnValue", "value", "dfc-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,37 +111,50 @@ 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, "Enqueue<T>", "(System.Collections.Immutable.ImmutableQueue<T>,T)", "", "Argument[0]", "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", "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"]
@@ -162,6 +173,7 @@ extensions:
       - ["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[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"]
@@ -184,9 +196,9 @@ extensions:
       - ["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.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 +208,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 +228,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 +266,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
@@ -375,6 +387,7 @@ extensions:
       - ["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"]
@@ -398,6 +411,7 @@ extensions:
       - ["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"]
@@ -427,7 +441,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 +455,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,16 +498,6 @@ 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"]
@@ -522,6 +524,7 @@ extensions:
       - ["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", "RemoveAt", "(System.Int32)", "summary", "df-generated"]
@@ -552,6 +555,7 @@ extensions:
       - ["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>", "RemoveAt", "(System.Int32)", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableList<T>", "get_Count", "()", "summary", "df-generated"]
@@ -578,7 +582,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 +597,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 +637,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..6093e204803 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,12 @@ 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", "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 +86,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"]
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..2f1fd8f32b2 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"]
@@ -150,6 +149,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..77e7cf98e97 100644
--- a/csharp/ql/lib/ext/generated/System.Collections.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Collections.model.yml
@@ -4,59 +4,60 @@ 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", "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", "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 +75,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"]
@@ -173,6 +175,7 @@ extensions:
       - ["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..eef7e3efc4e 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,95 @@ 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]", "ReturnValue", "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]", "ReturnValue", "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:
@@ -177,5 +188,6 @@ extensions:
       - ["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..f9de4bf682b 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,39 @@ 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, "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", "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, "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,6 +47,7 @@ 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"]
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..5261cf78292 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,10 @@ 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.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 +21,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..c825e665980 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,31 +4,29 @@ 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.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.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<T>", "()", "", "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, "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<TContract>", "(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>>)", "", "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, "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
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..68dfefaccb9 100644
--- a/csharp/ql/lib/ext/generated/System.ComponentModel.Composition.model.yml
+++ b/csharp/ql/lib/ext/generated/System.ComponentModel.Composition.model.yml
@@ -5,21 +5,24 @@ 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", "CompositionException", True, "get_Message", "()", "", "Argument[this].Property[System.Exception.Message]", "ReturnValue", "value", "dfc-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"]
   - addsTo:
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..330524f52ed 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,13 @@ 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", "CompareAttribute", True, "FormatErrorMessage", "(System.String)", "", "Argument[this].Property[System.ComponentModel.DataAnnotations.CompareAttribute.OtherPropertyDisplayName]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.ComponentModel.DataAnnotations", "CompareAttribute", True, "FormatErrorMessage", "(System.String)", "", "Argument[this].Property[System.ComponentModel.DataAnnotations.CompareAttribute.OtherProperty]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.ComponentModel.DataAnnotations", "CompareAttribute", True, "FormatErrorMessage", "(System.String)", "", "Argument[this].Property[System.ComponentModel.DataAnnotations.ValidationAttribute.ErrorMessageString]", "ReturnValue", "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 +20,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", "RangeAttribute", True, "FormatErrorMessage", "(System.String)", "", "Argument[this].Property[System.ComponentModel.DataAnnotations.RangeAttribute.Maximum]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.ComponentModel.DataAnnotations", "RangeAttribute", True, "FormatErrorMessage", "(System.String)", "", "Argument[this].Property[System.ComponentModel.DataAnnotations.RangeAttribute.Minimum]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.ComponentModel.DataAnnotations", "RangeAttribute", 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", 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, "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
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..f29c42d0763 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
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..b05cd41f985 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"]
@@ -81,6 +85,7 @@ extensions:
       - ["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"]
diff --git a/csharp/ql/lib/ext/generated/System.ComponentModel.model.yml b/csharp/ql/lib/ext/generated/System.ComponentModel.model.yml
index f9c4466a3c3..8db5c6059b5 100644
--- a/csharp/ql/lib/ext/generated/System.ComponentModel.model.yml
+++ b/csharp/ql/lib/ext/generated/System.ComponentModel.model.yml
@@ -5,39 +5,41 @@ 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", "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 +49,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 +75,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 +88,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 +122,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 +159,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 +181,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:
@@ -228,6 +214,7 @@ extensions:
       - ["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"]
@@ -262,12 +249,14 @@ 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>", "InsertItem", "(System.Int32,T)", "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>", "RemoveIndex", "(System.ComponentModel.PropertyDescriptor)", "summary", "df-generated"]
@@ -276,6 +265,7 @@ extensions:
       - ["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>", "get_AllowEdit", "()", "summary", "df-generated"]
       - ["System.ComponentModel", "BindingList<T>", "get_AllowNew", "()", "summary", "df-generated"]
       - ["System.ComponentModel", "BindingList<T>", "get_AllowRemove", "()", "summary", "df-generated"]
@@ -350,6 +340,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 +406,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 +479,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,6 +495,7 @@ 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", "get_AllowEdit", "()", "summary", "df-generated"]
@@ -511,6 +503,7 @@ extensions:
       - ["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"]
@@ -535,6 +528,7 @@ extensions:
       - ["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", "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 +537,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"]
@@ -637,6 +632,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"]
@@ -720,6 +716,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"]
@@ -800,6 +797,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"]
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..a24a53fa01a 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,27 @@ 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.Object)", "", "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.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.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.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<T>", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Composition.Convention", "PartConventionBuilder", False, "ExportInterfaces", "()", "", "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<TContract>", "(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>>)", "", "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, "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
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..a6b72867d25 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,31 +4,32 @@ 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", "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", 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"]
@@ -41,6 +42,8 @@ extensions:
       - ["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, "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
@@ -52,7 +55,6 @@ extensions:
       - ["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", "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..9711f192098 100644
--- a/csharp/ql/lib/ext/generated/System.Composition.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Composition.model.yml
@@ -13,19 +13,19 @@ 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", "ExportAttribute", False, "ExportAttribute", "(System.String,System.Type)", "", "Argument[0]", "Argument[this].Property[System.Composition.ExportAttribute.ContractName]", "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
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..aa863c13d5d 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"]
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..270506d6d72 100644
--- a/csharp/ql/lib/ext/generated/System.Configuration.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Configuration.model.yml
@@ -8,16 +8,24 @@ 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, "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 +37,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 +56,83 @@ 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", "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 +141,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"]
@@ -272,6 +283,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 +294,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 +345,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"]
@@ -423,6 +438,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"]
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..4bcbcd9a7a5 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
@@ -178,6 +136,7 @@ extensions:
       - ["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 +149,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 +186,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 +207,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,6 +230,7 @@ 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", "get_CanCreateBatch", "()", "summary", "df-generated"]
       - ["System.Data.Common", "DbConnection", "get_ConnectionTimeout", "()", "summary", "df-generated"]
       - ["System.Data.Common", "DbConnection", "get_DataSource", "()", "summary", "df-generated"]
@@ -264,6 +242,7 @@ extensions:
       - ["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 +260,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 +309,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 +328,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 +356,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 +383,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 +419,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..ba7118c9641 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"]
@@ -130,6 +127,8 @@ extensions:
       - ["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", "OdbcDataReader", "Close", "()", "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..6bc9458633d 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"]
@@ -55,6 +56,8 @@ extensions:
       - ["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"]
@@ -134,6 +137,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 +168,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..101062b5e61 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,12 +48,8 @@ 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"]
@@ -104,14 +83,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 +96,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 +117,10 @@ 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", "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 +129,36 @@ 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", "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", "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 +173,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 +195,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"]
@@ -356,6 +323,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"]
@@ -374,7 +342,10 @@ extensions:
       - ["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"]
@@ -444,7 +415,9 @@ extensions:
       - ["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"]
@@ -456,6 +429,8 @@ extensions:
       - ["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", "NewRow", "()", "summary", "df-generated"]
+      - ["System.Data", "DataTable", "NewRowFromBuilder", "(System.Data.DataRowBuilder)", "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"]
@@ -562,6 +537,7 @@ extensions:
       - ["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"]
@@ -581,17 +557,20 @@ 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", "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"]
@@ -605,6 +584,7 @@ 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"]
@@ -630,6 +610,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 +643,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..685395af96a 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,27 @@ 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", "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
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..b221b1359d5 100644
--- a/csharp/ql/lib/ext/generated/System.Diagnostics.Metrics.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Diagnostics.Metrics.model.yml
@@ -4,10 +4,8 @@ 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", "MeterOptions", False, "MeterOptions", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
   - addsTo:
       pack: codeql/csharp-all
@@ -29,6 +27,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,6 +46,7 @@ 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"]
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..e81376507ef 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,29 @@ 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", "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, "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
@@ -58,7 +64,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"]
diff --git a/csharp/ql/lib/ext/generated/System.Diagnostics.model.yml b/csharp/ql/lib/ext/generated/System.Diagnostics.model.yml
index 825ccc11f5c..c4d16e06988 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,24 @@ 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", "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 +83,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 +97,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 +143,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
@@ -311,8 +301,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 +317,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 +326,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 +363,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"]
@@ -497,6 +484,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"]
@@ -635,6 +623,7 @@ extensions:
       - ["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"]
@@ -739,6 +728,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 +740,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"]
@@ -795,9 +786,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 +807,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"]
@@ -836,6 +839,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..17f872e7567 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,66 @@ 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, "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 +73,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 +100,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"]
@@ -150,6 +139,7 @@ extensions:
       - ["System.DirectoryServices.Protocols", "ExtendedRequest", "ExtendedRequest", "(System.String)", "summary", "df-generated"]
       - ["System.DirectoryServices.Protocols", "LdapConnection", "Abort", "(System.IAsyncResult)", "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 +148,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..acd5b23611b 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
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..d9538cfadb0 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
@@ -28,8 +31,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..1579588723b 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,15 @@ 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", "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 +38,16 @@ 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", "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 +55,13 @@ 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", "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..6566798151b 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"]
@@ -60,6 +55,7 @@ extensions:
       - ["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", "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..b872d9fe6d6 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,6 +27,7 @@ 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"]
diff --git a/csharp/ql/lib/ext/generated/System.IO.model.yml b/csharp/ql/lib/ext/generated/System.IO.model.yml
index 4dc5013b0d9..03349fbdd99 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,78 @@ 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, "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 +163,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 +210,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 +248,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 +409,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 +486,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 +518,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"]
@@ -713,7 +723,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..b6831ab6746 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,58 +162,58 @@ 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"]
@@ -215,106 +224,89 @@ extensions:
       - ["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 +597,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..f34de1978d8 100644
--- a/csharp/ql/lib/ext/generated/System.Linq.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Linq.model.yml
@@ -5,61 +5,61 @@ extensions:
       extensible: summaryModel
     data:
       - ["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, "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, "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, "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, "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, "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, "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"]
@@ -73,35 +73,13 @@ extensions:
       - ["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, "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
@@ -147,8 +125,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"]
@@ -163,9 +144,11 @@ extensions:
       - ["System.Linq", "ILookup<TKey,TElement>", "get_Count", "()", "summary", "df-generated"]
       - ["System.Linq", "ILookup<TKey,TElement>", "get_Item", "(TKey)", "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", "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", "LastOrDefault<T>", "(System.Collections.Immutable.ImmutableArray<T>)", "summary", "df-generated"]
@@ -230,6 +213,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 +224,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 +252,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 +271,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.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.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..c386334050d 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"]
@@ -135,6 +137,7 @@ extensions:
       - ["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..ccdf6dd46df 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
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..d4410cc0aa9 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,14 +19,13 @@ 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, "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, "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"]
@@ -97,6 +96,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"]
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..0a23568c6ea 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,31 @@ 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, "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 +48,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 +77,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 +117,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 +134,24 @@ 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", "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 +162,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 +191,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 +220,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 +243,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,6 +254,7 @@ 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", "get_Buffer", "()", "summary", "df-generated"]
@@ -333,13 +268,21 @@ extensions:
       - ["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", "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,6 +302,7 @@ 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"]
@@ -371,6 +315,7 @@ 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", "Close", "()", "summary", "df-generated"]
@@ -393,6 +338,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..2c6875a816a 100644
--- a/csharp/ql/lib/ext/generated/System.Net.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Net.model.yml
@@ -11,11 +11,13 @@ 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"]
@@ -38,31 +40,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 +76,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
@@ -371,6 +279,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"]
@@ -504,6 +413,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 +434,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,6 +467,35 @@ 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", "get_IsBusy", "()", "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"]
@@ -592,6 +552,7 @@ extensions:
       - ["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..224d0fb7272 100644
--- a/csharp/ql/lib/ext/generated/System.Reflection.Context.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Reflection.Context.model.yml
@@ -5,8 +5,8 @@ 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
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..129fed96c8a 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,6 +167,7 @@ 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"]
@@ -192,6 +200,7 @@ 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"]
@@ -212,6 +221,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 +268,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 +283,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,6 +374,7 @@ 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"]
@@ -398,7 +411,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,6 +457,7 @@ 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"]
@@ -513,6 +527,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..f871ccbf43e 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,20 @@ 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", "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.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
@@ -357,7 +358,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..e2a2d653d25 100644
--- a/csharp/ql/lib/ext/generated/System.Reflection.PortableExecutable.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Reflection.PortableExecutable.model.yml
@@ -4,7 +4,7 @@ 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", "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", True, "GetDirectories", "()", "", "Argument[this]", "ReturnValue", "taint", "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..28f58e64690 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,46 @@ 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", "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 +68,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,12 +85,7 @@ 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", True, "GetGenericArguments", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -104,12 +95,9 @@ extensions:
       - ["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"]
@@ -138,13 +126,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"]
@@ -161,24 +149,19 @@ extensions:
       - ["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 +178,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"]
@@ -254,6 +238,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"]
@@ -382,6 +367,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 +408,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 +433,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,9 +446,13 @@ 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"]
@@ -496,6 +490,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"]
@@ -510,6 +505,7 @@ extensions:
       - ["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 +536,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 +555,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"]
@@ -578,6 +576,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 +617,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.model.yml b/csharp/ql/lib/ext/generated/System.Runtime.Caching.model.yml
index 929cb1d4320..90f5e5e00e0 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"]
@@ -45,6 +44,7 @@ extensions:
       - ["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 +76,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..eb14ac21c9d 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,47 @@ 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", "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 +54,52 @@ 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", "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 +109,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 +117,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 +160,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"]
@@ -208,17 +237,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"]
@@ -276,11 +304,7 @@ extensions:
       - ["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 +314,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 +332,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"]
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.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.model.yml b/csharp/ql/lib/ext/generated/System.Runtime.InteropServices.model.yml
index 5a631539aed..bb55ab06ce5 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"]
@@ -623,7 +625,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 +646,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..1f0cb1f44af 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
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..987cf15f297 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"]
@@ -56,4 +54,6 @@ 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", "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.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..61c69e94857 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,70 @@ 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, "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", "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:
@@ -188,6 +188,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"]
@@ -301,6 +303,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.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..e707ede375e 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,32 @@ 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, "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 +50,39 @@ 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.String)", "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.String)", "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.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..4652d98e240 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"]
@@ -86,6 +93,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 +111,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..5660f3a3674 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
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.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.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..a2c7a5778fe 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,66 @@ 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", "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 +121,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"]
@@ -270,6 +269,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..f74a3c2c81a 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,29 @@ 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, "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", "RegexRunnerFactory", True, "CreateInstance", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
   - addsTo:
       pack: codeql/csharp-all
@@ -90,6 +79,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 +102,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 +116,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 +135,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"]
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.RateLimiting.model.yml b/csharp/ql/lib/ext/generated/System.Threading.RateLimiting.model.yml
index 2ab389863d7..4ef8a7e254f 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"]
@@ -55,6 +55,8 @@ extensions:
       - ["System.Threading.RateLimiting", "RateLimitPartition", "GetNoLimiter<TKey>", "(TKey)", "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 +64,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 +72,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..26934875583 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"]
@@ -70,14 +69,14 @@ 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"]
   - addsTo:
       pack: codeql/csharp-all
       extensible: neutralModel
@@ -130,6 +129,7 @@ extensions:
       - ["System.Threading.Tasks.Dataflow", "BufferBlock<T>", "ToString", "()", "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", "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"]
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..e992db859db 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,9 +4,9 @@ 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
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..0fbca1fad58 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,39 @@ 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, "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, "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", "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
@@ -194,6 +193,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..66d8b23c906 100644
--- a/csharp/ql/lib/ext/generated/System.Threading.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Threading.model.yml
@@ -4,27 +4,36 @@ 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, "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", "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", "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", "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 +42,23 @@ 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", "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
@@ -166,13 +184,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 +195,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,7 +262,6 @@ 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"]
@@ -264,11 +275,9 @@ extensions:
       - ["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"]
@@ -391,27 +400,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"]
@@ -479,14 +482,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..62549393c47 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
diff --git a/csharp/ql/lib/ext/generated/System.Transactions.model.yml b/csharp/ql/lib/ext/generated/System.Transactions.model.yml
index 1dedcb96179..144e86521fd 100644
--- a/csharp/ql/lib/ext/generated/System.Transactions.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Transactions.model.yml
@@ -7,8 +7,7 @@ extensions:
       - ["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 +15,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"]
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.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..3b42cbae9b2 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"]
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..186dfd41ba0 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,10 +27,11 @@ 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"]
@@ -45,9 +46,9 @@ extensions:
       - ["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 +57,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 +80,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 +97,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 +116,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"]
@@ -174,6 +166,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 +180,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"]
@@ -219,3 +213,5 @@ extensions:
       - ["System.Xml.Schema", "XmlSchemaValidator", "GetUnspecifiedDefaultAttributes", "(System.Collections.ArrayList)", "summary", "df-generated"]
       - ["System.Xml.Schema", "XmlSchemaValidator", "Initialize", "()", "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", "ValidateWhitespace", "(System.String)", "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..f6d1eb309f5 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,19 +84,16 @@ 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", "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, "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"]
@@ -112,9 +102,8 @@ extensions:
       - ["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 +112,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 +147,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 +295,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 +308,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"]
@@ -342,6 +369,7 @@ 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", "CheckReaderCount", "(System.Int32,System.Int32)", "summary", "df-generated"]
       - ["System.Xml.Serialization", "XmlSerializationReader", "CreateAbstractTypeException", "(System.String,System.String)", "summary", "df-generated"]
@@ -406,22 +434,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"]
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..0d74f794c99 100644
--- a/csharp/ql/lib/ext/generated/System.Xml.XPath.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Xml.XPath.model.yml
@@ -4,18 +4,16 @@ 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"]
@@ -28,8 +26,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 +36,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 +57,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 +75,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"]
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..c727d29eac2 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"]
@@ -98,6 +98,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..0e885ed6c27 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,18 +319,19 @@ 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]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml", "XmlReader", True, "ReadContentAsAsync", "(System.Type,System.Xml.IXmlNamespaceResolver)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
@@ -357,31 +374,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 +425,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 +435,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 +485,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"]
@@ -554,6 +591,7 @@ 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", "CreateMtomReader", "(System.Byte[],System.Int32,System.Int32,System.Text.Encoding,System.Xml.XmlDictionaryReaderQuotas)", "summary", "df-generated"]
@@ -562,6 +600,8 @@ extensions:
       - ["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.Xml.XmlDictionaryReaderQuotas)", "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.Xml.XmlDictionaryReaderQuotas)", "summary", "df-generated"]
       - ["System.Xml", "XmlDictionaryReader", "EndCanonicalization", "()", "summary", "df-generated"]
       - ["System.Xml", "XmlDictionaryReader", "IndexOfLocalName", "(System.String[],System.String)", "summary", "df-generated"]
@@ -663,34 +703,18 @@ 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"]
@@ -729,7 +753,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 +792,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"]
@@ -848,7 +870,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 +920,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"]
@@ -924,7 +944,6 @@ extensions:
       - ["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..c1e5e9d6bfe 100644
--- a/csharp/ql/lib/ext/generated/System.model.yml
+++ b/csharp/ql/lib/ext/generated/System.model.yml
@@ -6,72 +6,72 @@ extensions:
     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", 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, "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, "Resize<T>", "(T[],System.Int32)", "", "Argument[0]", "ReturnValue", "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 +81,127 @@ 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", "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", "(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 +210,177 @@ 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, "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, "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, "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 +445,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,8 +466,8 @@ 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, "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"]
@@ -457,8 +476,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 +500,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 +612,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
@@ -796,8 +813,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"]
@@ -901,10 +918,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 +931,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"]
@@ -1873,6 +1894,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"]
@@ -2163,6 +2185,7 @@ extensions:
       - ["System", "Environment", "get_WorkingSet", "()", "summary", "df-generated"]
       - ["System", "Exception", "GetType", "()", "summary", "df-generated"]
       - ["System", "Exception", "get_Data", "()", "summary", "df-generated"]
+      - ["System", "Exception", "get_TargetSite", "()", "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"]
@@ -3411,10 +3434,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"]
@@ -3943,8 +3964,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"]
@@ -5099,6 +5118,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 +5133,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 cdebb33e8ec..4be589f7404 100644
--- a/csharp/ql/lib/qlpack.yml
+++ b/csharp/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/csharp-all
-version: 3.0.1
+version: 3.1.0
 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/dataflow/internal/DataFlowImpl1.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl1.qll
index ce964917e97..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) {
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 ce964917e97..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) {
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 ce964917e97..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) {
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 ce964917e97..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) {
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 ce964917e97..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) {
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/dataflow/LogForgingQuery.qll b/csharp/ql/lib/semmle/code/csharp/security/dataflow/LogForgingQuery.qll
index ebb481d2525..422b5dc717a 100644
--- a/csharp/ql/lib/semmle/code/csharp/security/dataflow/LogForgingQuery.qll
+++ b/csharp/ql/lib/semmle/code/csharp/security/dataflow/LogForgingQuery.qll
@@ -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/src/CHANGELOG.md b/csharp/ql/src/CHANGELOG.md
index 59a98aca72a..fe0765a3b18 100644
--- a/csharp/ql/src/CHANGELOG.md
+++ b/csharp/ql/src/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 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.
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.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/codeql-pack.release.yml b/csharp/ql/src/codeql-pack.release.yml
index 3865dbcf4b2..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.10
+lastReleaseVersion: 1.0.11
diff --git a/csharp/ql/src/qlpack.yml b/csharp/ql/src/qlpack.yml
index 90e7ec11d86..ce4e099c787 100644
--- a/csharp/ql/src/qlpack.yml
+++ b/csharp/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/csharp-queries
-version: 1.0.10
+version: 1.0.11
 groups:
   - csharp
   - queries
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/rust/integration-tests/hello-project/src/directory_module/nested_module.rs b/csharp/ql/test/TestUtilities/inline-tests/queries/ProblemQuery.expected
similarity index 100%
rename from rust/integration-tests/hello-project/src/directory_module/nested_module.rs
rename to csharp/ql/test/TestUtilities/inline-tests/queries/ProblemQuery.expected
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/dataflow/collections/CollectionFlow.expected b/csharp/ql/test/library-tests/dataflow/collections/CollectionFlow.expected
index dfc46ac8071..93232381233 100644
--- a/csharp/ql/test/library-tests/dataflow/collections/CollectionFlow.expected
+++ b/csharp/ql/test/library-tests/dataflow/collections/CollectionFlow.expected
@@ -24,6 +24,7 @@ models
 | 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.Collections.Generic; List<T>+Enumerator; false; get_Current; (); ; Argument[this].Property[System.Collections.Generic.List`1+Enumerator.Current]; ReturnValue; value; dfc-generated |
 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 |  |
@@ -235,9 +236,14 @@ 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: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: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: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:26 |
+| 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:26 |
 | 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 |  |
@@ -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/library/FlowSummaries.expected b/csharp/ql/test/library-tests/dataflow/library/FlowSummaries.expected
index ccb38ae35f9..17090f932df 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 |
@@ -835,8 +835,7 @@ summary
 | 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;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;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 |
@@ -909,7 +908,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 +1324,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 +1492,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 +1519,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 +1616,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 +1640,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 +1658,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 +1684,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 +1704,30 @@ 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[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[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];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 +1735,34 @@ 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[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[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;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 +1777,108 @@ 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[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;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;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[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[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[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[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[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[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 +1892,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 +1921,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,14 +1934,14 @@ 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[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[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[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[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[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[1];Argument[1].Parameter[delegate-self];value;hq-generated |
@@ -2020,14 +1951,14 @@ summary
 | 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[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[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[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[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[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 |
@@ -2054,8 +1985,7 @@ summary
 | 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 +1994,13 @@ 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[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[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[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[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,22 +2065,22 @@ 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[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[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[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[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[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[2];Argument[2].Parameter[delegate-self];value;hq-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[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[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.DependencyInjection;OptionsServiceCollectionExtensions;PostConfigureAll<TOptions>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<TOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
@@ -2178,57 +2108,53 @@ 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[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[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[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[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[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[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[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[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[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[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[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[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[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[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[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[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[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[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[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;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;hq-generated |
@@ -2236,10 +2162,10 @@ summary
 | 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>;(System.Object,System.Func<System.IServiceProvider,System.Object,TService>);Argument[1];Argument[1].Parameter[delegate-self];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;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.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;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;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,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;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;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;hq-generated |
@@ -2248,7 +2174,7 @@ summary
 | 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;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.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.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;hq-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>;(System.Func<System.IServiceProvider,TService>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
@@ -2257,19 +2183,18 @@ summary
 | 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>;(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_ImplementationInstance;();Argument[this].SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationInstance];ReturnValue;value;dfc-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;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[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 +2204,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 +2212,87 @@ 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;hq-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;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;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.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.FileSystemGlobbing;MatcherExtensions;GetResultsInFullPath;(Microsoft.Extensions.FileSystemGlobbing.Matcher,System.String);Argument[1];ReturnValue.Element;taint;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,11 +2312,10 @@ 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 |
@@ -2418,12 +2325,11 @@ summary
 | 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;ConfigureHostConfiguration;(System.Action<Microsoft.Extensions.Configuration.IConfigurationBuilder>);Argument[0];Argument[0].Parameter[delegate-self];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;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;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;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;hq-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[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[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[1];Argument[1].Parameter[delegate-self];value;hq-generated |
@@ -2432,17 +2338,16 @@ summary
 | 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[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[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[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[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 |
@@ -2455,23 +2360,20 @@ summary
 | 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;ConfigureHostConfiguration;(System.Action<Microsoft.Extensions.Configuration.IConfigurationBuilder>);Argument[0];Argument[0].Parameter[delegate-self];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;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;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;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 |
@@ -2488,18 +2390,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,54 +2417,54 @@ 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[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[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[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[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[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[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[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[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[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[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[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[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[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[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[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[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[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[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[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[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[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[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[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;hq-generated |
 | Microsoft.Extensions.Logging;IExternalScopeProvider;Push;(System.Object);Argument[0];ReturnValue;taint;df-generated |
@@ -2597,19 +2496,19 @@ 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[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>;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 |
@@ -2655,7 +2554,8 @@ 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>;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>;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>;PostConfigureOptions;(System.String,TDep1,TDep2,TDep3,System.Action<TOptions,TDep1,TDep2,TDep3>);Argument[4];Argument[4].Parameter[delegate-self];value;hq-generated |
@@ -2680,26 +2580,28 @@ summary
 | 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;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;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 +2667,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 +2753,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 +2764,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 +2783,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 +2809,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 +2824,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 +3208,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 +3221,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 +3238,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 +3330,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 +3337,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 +3588,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 +3601,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 +3685,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 |
@@ -4393,7 +4274,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 +4389,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 +4507,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 +5022,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 +5089,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 +5180,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 +5205,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 +5490,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 +5503,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 +5563,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 +5627,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 +5635,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 |
@@ -5777,14 +5664,13 @@ summary
 | 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[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[1];Argument[1].Parameter[delegate-self];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 +5681,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 +5704,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 +5723,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 +5731,28 @@ 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>;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 +5766,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 +5778,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 +5800,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 |
@@ -5938,12 +5829,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 +5855,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 +5881,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 +5896,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 +5915,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 +5943,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 +5956,54 @@ 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;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 +6011,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 +6025,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 +6048,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 +6067,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 +6090,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 +6100,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 +6129,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 +6145,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 |
@@ -6257,7 +6166,7 @@ summary
 | 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 +6176,99 @@ 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;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;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;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;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>;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>;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>;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;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>;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[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>;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>;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>;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];ReturnValue;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.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>;Sort;(System.Int32,System.Int32,System.Collections.Generic.IComparer<T>);Argument[this];ReturnValue;value;dfc-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 +6277,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 +6306,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 +6332,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 +6346,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 +6369,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 +6380,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,24 +6394,33 @@ 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[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];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[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[2];Argument[2].Parameter[delegate-self];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;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[1];Argument[1].Parameter[delegate-self];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;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;hq-generated |
@@ -6547,19 +6471,19 @@ summary
 | 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;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[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 |
@@ -6597,8 +6521,6 @@ summary
 | 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>;Remove;(T);Argument[this];ReturnValue;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 |
@@ -6618,15 +6540,14 @@ 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;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.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 +6559,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 +6602,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 +6623,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 +6635,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 +6680,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 +6708,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 +6736,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 +6784,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 +6797,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 +6820,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 +6835,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 +6845,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 +6863,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 +6887,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 +6895,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 +6926,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 +6942,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 +6954,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,30 +6969,26 @@ 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;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 |
@@ -7104,28 +6998,30 @@ 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;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 +7048,19 @@ 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;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 |
@@ -7184,25 +7078,21 @@ summary
 | 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 +7112,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 +7122,23 @@ 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.CompareAttribute.OtherPropertyDisplayName];ReturnValue;taint;dfc-generated |
+| System.ComponentModel.DataAnnotations;CompareAttribute;FormatErrorMessage;(System.String);Argument[this].Property[System.ComponentModel.DataAnnotations.CompareAttribute.OtherProperty];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 +7148,55 @@ 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.RangeAttribute.Maximum];ReturnValue;taint;dfc-generated |
+| System.ComponentModel.DataAnnotations;RangeAttribute;FormatErrorMessage;(System.String);Argument[this].Property[System.ComponentModel.DataAnnotations.RangeAttribute.Minimum];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;hq-generated |
-| System.ComponentModel.DataAnnotations;ValidationContext;GetService;(System.Type);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;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 +7204,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 +7288,149 @@ 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>;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 +7440,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 +7450,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 +7474,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 +7495,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 +7514,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 +7532,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 +7595,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 +7610,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 +7618,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 +7688,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 +7704,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 +7739,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,22 +7772,19 @@ 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 |
@@ -7943,11 +7794,14 @@ summary
 | 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 |
@@ -7956,35 +7810,64 @@ summary
 | 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 +7879,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 +7903,144 @@ 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;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;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;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 +8049,29 @@ 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;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;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,7 +8083,10 @@ 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 |
@@ -8223,146 +8095,140 @@ summary
 | 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;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_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 +8237,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 +8272,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 +8296,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 +8320,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 +8455,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 +8476,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 +8543,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 +8581,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 +8920,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 +8955,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 +8976,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 +9004,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 +9046,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 +9101,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 +9125,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 |
@@ -9426,23 +9175,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 +9206,26 @@ 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;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 +9246,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 +9257,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 +9278,17 @@ 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[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 +9296,44 @@ 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;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;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 +9341,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 +9392,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 +9412,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 +9427,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 +9434,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 |
@@ -9752,30 +9476,28 @@ summary
 | 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 |
@@ -9799,7 +9521,7 @@ summary
 | 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.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 |
@@ -9808,53 +9530,59 @@ summary
 | 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;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 +9599,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 +9629,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,9 +9657,9 @@ 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[1];Argument[1].Parameter[delegate-self];value;hq-generated |
@@ -9940,8 +9671,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 +9688,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 +9704,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 +9727,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 +9777,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 +9793,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 +9804,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 +9827,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 +9856,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 +9949,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 +10038,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 +10075,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 +10092,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 +10154,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 +10200,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 +10212,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 +10230,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 +10242,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 +10250,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 +10260,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 +10286,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 +10301,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 +10316,41 @@ 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;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 +10360,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 +10381,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 +10392,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 +10421,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 +10460,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 +10512,27 @@ 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;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 +10544,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 +10563,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 +10587,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 +10622,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 +10640,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 +10650,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 +10688,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 +10706,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 +10734,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 +10751,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 +10789,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 +10815,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 +10856,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 +10877,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 +10925,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 +10971,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 +10995,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 +11012,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 +11028,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 +11049,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 +11102,12 @@ 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[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 +11115,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,7 +11261,7 @@ 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;Count<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,System.Boolean>);Argument[0].Element;Argument[1].Parameter[0];value;manual |
@@ -11677,9 +11273,9 @@ summary
 | 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[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[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 |
@@ -11694,8 +11290,8 @@ summary
 | 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[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>,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 |
@@ -11784,14 +11380,14 @@ summary
 | 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;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>,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 +11415,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 +11447,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 +11461,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 |
@@ -11905,8 +11499,8 @@ summary
 | 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[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>,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 +11551,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 +11577,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 |
@@ -12013,24 +11610,21 @@ 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];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[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[2];Argument[2].Parameter[delegate-self];value;hq-generated |
@@ -12100,7 +11694,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 |
@@ -12488,7 +12082,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 +12105,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 +12114,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 +12189,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 +12227,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 +12239,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 +12274,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 +12301,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 +12323,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 +12335,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 +12342,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 +12396,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 +12412,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 +12511,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 +12530,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 +12542,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 +12559,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 +12567,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 +12596,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 +12615,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 +12634,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 +12661,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 +12677,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 +12732,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 +12741,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 +12797,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 +12816,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 +12829,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 +12845,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 +12874,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 +12888,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 |
@@ -13370,8 +12910,7 @@ 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;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 +12919,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 +12942,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 +12953,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 |
@@ -13448,75 +12979,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 +13010,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 +13034,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 +13051,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 +13071,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 +13103,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 +13126,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 |
@@ -13750,26 +13181,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 +13214,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 +13242,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 +13254,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 +13316,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 +13333,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 +13448,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,7 +13456,6 @@ 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;get_DeclaringType;();Argument[this];ReturnValue;taint;df-generated |
@@ -14159,31 +13481,40 @@ 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;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 +13539,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 +13555,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 +13583,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,12 +13591,9 @@ 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;MakeGenericMethod;(System.Type[]);Argument[0].Element;ReturnValue;taint;df-generated |
@@ -14310,9 +13633,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 +13649,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,7 +13657,6 @@ 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 |
@@ -14349,7 +13672,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 +13705,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 +13734,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 +13763,47 @@ 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;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;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;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.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 +13811,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 +13821,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 +14013,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 +14057,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 +14077,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,21 +14085,25 @@ 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[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 |
@@ -14734,9 +14123,8 @@ summary
 | 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[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 +14136,52 @@ 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;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 +14192,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 |
@@ -14836,12 +14218,9 @@ summary
 | 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 |
@@ -14850,7 +14229,6 @@ summary
 | System.Reflection;MethodInfoExtensions;GetBaseDefinition;(System.Reflection.MethodInfo);Argument[0];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;hq-generated |
-| System.Reflection;Module;GetCustomAttributes;(System.Boolean);Argument[this];ReturnValue;taint;df-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 +14252,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 |
@@ -14901,24 +14278,18 @@ summary
 | 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 +14309,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 +14335,49 @@ 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[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 +14398,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,11 +14432,8 @@ 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 |
@@ -15056,18 +14441,29 @@ summary
 | 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;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 +14471,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 +14530,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 +14669,26 @@ 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;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 +14700,95 @@ 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;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;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 +14796,61 @@ 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;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;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 +14860,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 +14890,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 +14905,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 +14915,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 +14927,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 +14946,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 +14992,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 +15053,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 +15137,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 +15194,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 +15219,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 +15229,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 +15243,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 +15308,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 +15340,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 +15537,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 +15560,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 +15623,85 @@ 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;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 +15712,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 +15728,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 +15747,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 +15766,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 +15785,43 @@ 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[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[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[2];Argument[2].Parameter[delegate-self];value;hq-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[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[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.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 +15832,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 +15883,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 +15903,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 +15955,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 +15972,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 +15997,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 +16034,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 +16071,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,16 +16091,12 @@ 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 |
@@ -16805,7 +16142,6 @@ summary
 | 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 |
@@ -16876,24 +16212,24 @@ 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>;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;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 +16383,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 +16488,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 |
@@ -17292,12 +16631,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 |
@@ -17377,38 +16716,40 @@ 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[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 |
@@ -17420,25 +16761,32 @@ summary
 | System.Threading;CancellationToken;UnsafeRegister;(System.Action<System.Object>,System.Object);Argument[0];Argument[0].Parameter[delegate-self];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;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;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[3];Argument[3].Parameter[delegate-self];value;hq-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[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 +16799,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 |
@@ -17465,14 +16815,20 @@ summary
 | 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;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;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 +16858,30 @@ 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;hq-generated |
 | System.Transactions;CommittableTransaction;get_AsyncState;();Argument[this];ReturnValue;taint;df-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 +16891,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 +16905,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 +16914,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 +16924,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 +16971,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 +16983,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 +17003,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 +17012,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 +17042,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 +17057,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 +17078,27 @@ 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;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 +17107,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,8 +17138,7 @@ 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];ReturnValue;taint;df-generated |
@@ -17814,20 +17167,22 @@ 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 |
@@ -17843,8 +17198,8 @@ summary
 | 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 +17210,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 +17222,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 +17247,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 +17267,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 +17287,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 +17296,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 +17308,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 +17316,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 +17327,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 +17335,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 +17344,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 +17358,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 +17399,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,7 +17421,6 @@ 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 |
@@ -18100,9 +17439,8 @@ summary
 | 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 +17449,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 +17486,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,21 +17623,19 @@ 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 |
@@ -18279,8 +17648,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 +17660,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 |
@@ -18320,17 +17690,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 +17721,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 +17736,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 +17776,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 +17795,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 +17821,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 +17832,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 +17868,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,12 +17888,10 @@ 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 |
@@ -18549,21 +17900,19 @@ summary
 | 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 +17922,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 +17999,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 +18013,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 +18029,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 +18090,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 +18110,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 +18155,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 +18173,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 +18214,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 +18250,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 +18268,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 +18286,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 +18309,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,8 +18342,8 @@ 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];ReturnValue;taint;df-generated |
 | System.Xml;XmlReader;ReadContentAsAsync;(System.Type,System.Xml.IXmlNamespaceResolver);Argument[1];Argument[this];taint;df-generated |
@@ -19001,7 +18386,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 +18395,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 +18433,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 +18473,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 +18590,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 +18637,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 |
@@ -19240,9 +18682,10 @@ summary
 | 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;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;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,21 +18704,25 @@ 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 |
@@ -19286,8 +18733,8 @@ summary
 | 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[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 |
@@ -19306,8 +18753,7 @@ summary
 | 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 |
@@ -19315,83 +18761,80 @@ summary
 | 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[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 +19171,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 +19267,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 +19289,90 @@ 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;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 +19381,94 @@ 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;hq-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.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;(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 +19478,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,16 +19517,16 @@ 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;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 |
@@ -20131,64 +19534,79 @@ summary
 | 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 +19616,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 +19633,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 +19653,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 +19755,8 @@ 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[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 +19770,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 +19783,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 +19815,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 +19848,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 +19861,58 @@ 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;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 +20208,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,7 +20229,7 @@ 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;hq-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;GetConstructorImpl;(System.Reflection.BindingFlags,System.Reflection.Binder,System.Reflection.CallingConventions,System.Type[],System.Reflection.ParameterModifier[]);Argument[this];ReturnValue;taint;df-generated |
@@ -20825,8 +20240,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 +20256,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 +20273,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,11 +20578,12 @@ 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
@@ -21198,6 +20598,7 @@ neutral
 | 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;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 |
@@ -21414,7 +20815,17 @@ neutral
 | 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 |
@@ -21443,6 +20854,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 |
@@ -21470,77 +20882,113 @@ neutral
 | 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;XmlConfigurationSource;Build;(Microsoft.Extensions.Configuration.IConfigurationBuilder);summary;df-generated |
 | Microsoft.Extensions.Configuration.Xml;XmlDocumentDecryptor;DecryptDocumentAndCreateXmlReader;(System.Xml.XmlDocument);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.String,System.Object);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.Type);summary;df-generated |
 | Microsoft.Extensions.DependencyInjection.Extensions;ServiceCollectionDescriptorExtensions;TryAddKeyedScoped<TService,TImplementation>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object);summary;df-generated |
@@ -21635,6 +21083,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 |
@@ -21652,23 +21101,33 @@ 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 |
@@ -21679,39 +21138,53 @@ neutral
 | 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 |
@@ -21786,12 +21259,12 @@ 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 |
 | Microsoft.Extensions.FileSystemGlobbing;MatcherExtensions;AddExcludePatterns;(Microsoft.Extensions.FileSystemGlobbing.Matcher,System.Collections.Generic.IEnumerable<System.String>[]);summary;df-generated |
 | Microsoft.Extensions.FileSystemGlobbing;MatcherExtensions;AddIncludePatterns;(Microsoft.Extensions.FileSystemGlobbing.Matcher,System.Collections.Generic.IEnumerable<System.String>[]);summary;df-generated |
-| Microsoft.Extensions.FileSystemGlobbing;MatcherExtensions;GetResultsInFullPath;(Microsoft.Extensions.FileSystemGlobbing.Matcher,System.String);summary;df-generated |
 | Microsoft.Extensions.FileSystemGlobbing;MatcherExtensions;Match;(Microsoft.Extensions.FileSystemGlobbing.Matcher,System.Collections.Generic.IEnumerable<System.String>);summary;df-generated |
 | Microsoft.Extensions.FileSystemGlobbing;MatcherExtensions;Match;(Microsoft.Extensions.FileSystemGlobbing.Matcher,System.String);summary;df-generated |
 | Microsoft.Extensions.FileSystemGlobbing;MatcherExtensions;Match;(Microsoft.Extensions.FileSystemGlobbing.Matcher,System.String,System.Collections.Generic.IEnumerable<System.String>);summary;df-generated |
@@ -21809,6 +21282,7 @@ 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 |
@@ -21842,6 +21316,7 @@ neutral
 | 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;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 |
@@ -21857,6 +21332,8 @@ 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 |
@@ -22163,6 +21640,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 |
@@ -22183,6 +21661,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 |
@@ -22208,7 +21687,6 @@ neutral
 | 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 |
@@ -22462,7 +21940,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 |
@@ -22568,6 +22045,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 |
@@ -22658,7 +22136,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 |
@@ -22669,9 +22146,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 |
@@ -22701,9 +22175,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 |
@@ -22877,8 +22349,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 |
@@ -22953,11 +22427,13 @@ neutral
 | 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 |
@@ -22970,12 +22446,14 @@ neutral
 | 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;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 |
@@ -23043,6 +22521,7 @@ neutral
 | 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 |
@@ -23079,6 +22558,7 @@ neutral
 | 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 |
@@ -23099,8 +22579,12 @@ neutral
 | 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 |
@@ -23113,6 +22597,7 @@ neutral
 | 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 |
@@ -23147,6 +22632,7 @@ neutral
 | 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 |
@@ -23356,11 +22842,14 @@ neutral
 | 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 |
@@ -23383,11 +22872,20 @@ neutral
 | 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 |
@@ -23404,14 +22902,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 |
@@ -23435,6 +22928,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 |
@@ -23454,19 +22948,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 |
@@ -23490,6 +22997,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 |
@@ -23542,45 +23050,62 @@ 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;get_ReturnTypeCustomAttributes;();summary;df-generated |
@@ -23589,54 +23114,73 @@ neutral
 | 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;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;get_TypeParameters;();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 |
@@ -23778,6 +23322,7 @@ 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 |
@@ -23938,6 +23483,7 @@ 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>;RemoveAt;(System.Int32);summary;df-generated |
 | System.Collections.Generic;List<T>;RemoveRange;(System.Int32,System.Int32);summary;df-generated |
@@ -24051,6 +23597,7 @@ neutral
 | 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 |
@@ -24157,6 +23704,7 @@ neutral
 | 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 |
@@ -24182,6 +23730,7 @@ neutral
 | 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>;RemoveAt;(System.Int32);summary;df-generated |
@@ -24295,16 +23844,6 @@ neutral
 | 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 |
@@ -24331,6 +23870,7 @@ neutral
 | 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;RemoveAt;(System.Int32);summary;df-generated |
@@ -24364,6 +23904,7 @@ neutral
 | 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>;RemoveAt;(System.Int32);summary;df-generated |
@@ -24474,6 +24015,7 @@ 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 |
@@ -24502,6 +24044,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 |
@@ -24514,12 +24057,15 @@ neutral
 | 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 |
@@ -24527,10 +24073,12 @@ 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;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 |
@@ -24664,6 +24212,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 |
@@ -24692,6 +24241,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 |
@@ -24736,6 +24286,7 @@ 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 |
@@ -24790,6 +24341,7 @@ neutral
 | 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 |
@@ -25063,6 +24615,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 |
@@ -25091,6 +24644,7 @@ neutral
 | 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 |
@@ -25237,6 +24791,7 @@ neutral
 | 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 |
@@ -25271,12 +24826,14 @@ 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>;InsertItem;(System.Int32,T);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>;RemoveIndex;(System.ComponentModel.PropertyDescriptor);summary;df-generated |
@@ -25285,6 +24842,7 @@ neutral
 | 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>;get_AllowEdit;();summary;df-generated |
 | System.ComponentModel;BindingList<T>;get_AllowNew;();summary;df-generated |
 | System.ComponentModel;BindingList<T>;get_AllowRemove;();summary;df-generated |
@@ -25293,6 +24851,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 |
@@ -25359,6 +24918,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 |
@@ -25424,7 +24984,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 |
@@ -25498,6 +25057,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 |
@@ -25513,6 +25073,7 @@ 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;get_AllowEdit;();summary;df-generated |
@@ -25520,6 +25081,7 @@ neutral
 | 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 |
@@ -25544,6 +25106,7 @@ neutral
 | 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;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 |
@@ -25552,6 +25115,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 |
@@ -25646,6 +25210,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 |
@@ -25729,6 +25294,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 |
@@ -26180,6 +25746,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 |
@@ -26190,6 +25757,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 |
@@ -26240,11 +25808,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 |
@@ -26329,6 +25899,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 |
@@ -26467,24 +26038,28 @@ 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;get_TableMappings;();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 |
@@ -26521,11 +26096,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 |
@@ -26533,11 +26118,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 |
@@ -26548,6 +26141,7 @@ 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;get_CanCreateBatch;();summary;df-generated |
 | System.Data.Common;DbConnection;get_ConnectionTimeout;();summary;df-generated |
 | System.Data.Common;DbConnection;get_DataSource;();summary;df-generated |
@@ -26559,6 +26153,7 @@ neutral
 | 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 |
@@ -26576,6 +26171,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 |
@@ -26625,6 +26223,7 @@ neutral
 | 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 |
@@ -26643,6 +26242,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 |
@@ -26673,8 +26273,10 @@ neutral
 | 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 |
@@ -26699,6 +26301,8 @@ neutral
 | 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 |
@@ -26733,12 +26337,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 |
@@ -26748,14 +26359,17 @@ neutral
 | 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 |
@@ -26800,6 +26414,8 @@ neutral
 | 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 |
@@ -26818,6 +26434,7 @@ neutral
 | 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 |
@@ -26856,6 +26473,7 @@ neutral
 | 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 |
@@ -26865,8 +26483,10 @@ neutral
 | 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 |
@@ -26924,8 +26544,10 @@ neutral
 | 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 |
@@ -26934,11 +26556,13 @@ neutral
 | 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 |
@@ -26986,6 +26610,8 @@ neutral
 | 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 |
@@ -26997,12 +26623,15 @@ neutral
 | 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 |
@@ -27019,6 +26648,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 |
@@ -27130,6 +26760,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 |
@@ -27578,6 +27209,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 |
@@ -27632,6 +27264,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 |
@@ -27757,6 +27392,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 |
@@ -27766,6 +27402,7 @@ 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;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 |
@@ -27775,7 +27412,10 @@ neutral
 | 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 |
@@ -27845,7 +27485,9 @@ neutral
 | 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 |
@@ -27857,6 +27499,8 @@ neutral
 | 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;NewRow;();summary;df-generated |
+| System.Data;DataTable;NewRowFromBuilder;(System.Data.DataRowBuilder);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 |
@@ -27953,6 +27597,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 |
@@ -27966,6 +27611,7 @@ neutral
 | 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 |
@@ -27985,17 +27631,20 @@ 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;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 |
@@ -28009,6 +27658,7 @@ 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 |
@@ -28034,6 +27684,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 |
@@ -28069,15 +27720,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 |
@@ -28410,6 +28067,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 |
@@ -28428,6 +28086,7 @@ 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 |
@@ -28574,7 +28233,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 |
@@ -28729,8 +28387,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 |
@@ -28746,8 +28402,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 |
@@ -28757,8 +28411,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 |
@@ -28789,6 +28441,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 |
@@ -28908,6 +28563,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 |
@@ -28985,6 +28641,7 @@ neutral
 | 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 |
@@ -29090,6 +28747,7 @@ neutral
 | 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 |
@@ -29102,6 +28760,7 @@ neutral
 | 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 |
@@ -29146,9 +28805,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 |
@@ -29156,6 +28826,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 |
@@ -29187,6 +28858,9 @@ 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 |
@@ -29392,6 +29066,7 @@ 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 |
@@ -29779,24 +29454,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 |
@@ -29805,6 +29492,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 |
@@ -29812,6 +29501,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 |
@@ -29842,14 +29532,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 |
@@ -30407,6 +30102,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 |
@@ -30426,8 +30126,6 @@ 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 |
@@ -30513,6 +30211,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 |
@@ -30552,8 +30255,16 @@ 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;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 |
@@ -30561,12 +30272,15 @@ 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;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 |
@@ -30593,6 +30307,11 @@ 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 |
@@ -30610,6 +30329,7 @@ neutral
 | 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;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 |
@@ -30802,6 +30522,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 |
@@ -30906,13 +30627,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 |
@@ -31115,7 +30832,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 |
@@ -31416,7 +31132,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 |
@@ -31531,19 +31246,25 @@ 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;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;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;LastOrDefault<T>;(System.Collections.Immutable.ImmutableArray<T>);summary;df-generated |
@@ -31607,6 +31328,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 |
@@ -31617,14 +31339,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 |
@@ -31638,11 +31365,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 |
@@ -31653,7 +31384,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 |
@@ -31796,7 +31532,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 |
@@ -31902,6 +31640,8 @@ 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 |
@@ -31909,6 +31649,7 @@ neutral
 | 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 |
@@ -31954,6 +31695,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 |
@@ -31963,6 +31705,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 |
@@ -31970,6 +31714,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 |
@@ -32027,6 +31772,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 |
@@ -32034,6 +31780,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 |
@@ -32053,12 +31800,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 |
@@ -32067,11 +31818,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 |
@@ -32087,6 +31842,7 @@ neutral
 | 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 |
@@ -32394,6 +32150,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 |
@@ -32403,6 +32160,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 |
@@ -32488,6 +32246,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 |
@@ -32570,6 +32329,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 |
@@ -32586,15 +32346,24 @@ 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;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 |
@@ -32605,8 +32374,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 |
@@ -32636,7 +32403,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 |
@@ -32654,10 +32432,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 |
@@ -32672,6 +32455,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 |
@@ -32682,6 +32466,7 @@ 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;get_Buffer;();summary;df-generated |
@@ -32695,13 +32480,21 @@ neutral
 | 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;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 |
@@ -32721,6 +32514,7 @@ 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 |
@@ -32733,6 +32527,7 @@ 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;Close;();summary;df-generated |
@@ -32755,6 +32550,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 |
@@ -32779,6 +32576,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 |
@@ -32804,6 +32604,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 |
@@ -32912,11 +32715,13 @@ neutral
 | 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;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 |
@@ -32962,6 +32767,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 |
@@ -32983,6 +32789,7 @@ neutral
 | 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 |
@@ -33092,6 +32899,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 |
@@ -33112,6 +32920,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 |
@@ -33124,6 +32953,35 @@ 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;get_IsBusy;();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 |
@@ -33180,6 +33038,7 @@ neutral
 | 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 |
@@ -34113,7 +33972,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 |
@@ -34183,6 +34041,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 |
@@ -34202,6 +34061,7 @@ 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 |
@@ -34234,6 +34094,7 @@ 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 |
@@ -34254,6 +34115,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 |
@@ -34288,6 +34150,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 |
@@ -34302,6 +34165,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 |
@@ -34390,6 +34254,7 @@ 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 |
@@ -34426,7 +34291,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 |
@@ -34471,6 +34336,7 @@ 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 |
@@ -34539,6 +34405,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 |
@@ -34903,7 +34770,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 |
@@ -34939,6 +34805,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 |
@@ -34967,6 +34834,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 |
@@ -34984,6 +34852,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 |
@@ -35015,7 +34884,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 |
@@ -35098,6 +34966,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 |
@@ -35273,6 +35143,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 |
@@ -35468,6 +35339,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 |
@@ -35590,6 +35462,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 |
@@ -35690,6 +35563,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 |
@@ -35747,6 +35621,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 |
@@ -35921,6 +35796,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 |
@@ -35980,6 +35856,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 |
@@ -36106,6 +35983,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 |
@@ -36144,6 +36024,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 |
@@ -36168,6 +36049,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 |
@@ -36217,6 +36099,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 |
@@ -36231,6 +36114,7 @@ neutral
 | 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 |
@@ -36261,6 +36145,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 |
@@ -36298,6 +36183,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 |
@@ -36326,6 +36215,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 |
@@ -36458,7 +36348,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 |
@@ -36467,28 +36356,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 |
@@ -36509,6 +36391,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 |
@@ -36582,17 +36465,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 |
@@ -36647,11 +36529,7 @@ neutral
 | 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 |
@@ -36661,7 +36539,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 |
@@ -36680,11 +36557,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 |
@@ -37194,6 +37067,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 |
@@ -37491,7 +37365,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 |
@@ -37734,7 +37607,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 |
@@ -37756,7 +37628,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 |
@@ -43166,7 +43038,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 |
@@ -43409,7 +43280,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 |
@@ -43646,7 +43516,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 |
@@ -43883,7 +43752,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 |
@@ -44007,6 +43875,8 @@ 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;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.Xml.XmlDictionaryReaderQuotas);summary;df-generated |
 | System.Runtime.Serialization;CollectionDataContractAttribute;get_IsItemNameSetExplicitly;();summary;df-generated |
 | System.Runtime.Serialization;CollectionDataContractAttribute;get_IsKeyNameSetExplicitly;();summary;df-generated |
@@ -44120,6 +43990,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 |
@@ -44175,6 +44047,8 @@ 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 |
@@ -44193,6 +44067,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 |
@@ -44583,32 +44458,44 @@ 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.String);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.String);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.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 |
@@ -44619,6 +44506,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 |
@@ -44747,6 +44638,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 |
@@ -44768,8 +44660,10 @@ 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 |
@@ -44830,16 +44724,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 |
@@ -44901,8 +44799,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 |
@@ -44932,6 +44832,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 |
@@ -44940,17 +44841,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 |
@@ -44967,16 +44877,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 |
@@ -46137,6 +46061,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 |
@@ -46764,10 +46689,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 |
@@ -46818,6 +46748,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 |
@@ -46833,6 +46764,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 |
@@ -46850,6 +46782,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 |
@@ -47203,6 +47136,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 |
@@ -47260,6 +47194,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 |
@@ -47405,6 +47341,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 |
@@ -47524,6 +47461,7 @@ 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 |
@@ -47547,6 +47485,7 @@ 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 |
@@ -47565,6 +47504,7 @@ 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 |
@@ -47584,6 +47524,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 |
@@ -47820,8 +47761,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 |
@@ -47868,6 +47807,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 |
@@ -48012,6 +47952,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 |
@@ -48070,7 +48011,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 |
@@ -48169,11 +48109,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 |
@@ -48181,6 +48123,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 |
@@ -48202,6 +48145,8 @@ neutral
 | System.Threading.RateLimiting;RateLimitPartition;GetNoLimiter<TKey>;(TKey);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 |
@@ -48209,6 +48154,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 |
@@ -48216,6 +48162,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 |
@@ -48283,6 +48230,7 @@ neutral
 | System.Threading.Tasks.Dataflow;BufferBlock<T>;ToString;();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;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 |
@@ -48606,13 +48554,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 |
@@ -48620,13 +48565,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 |
@@ -48683,7 +48625,6 @@ 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;Unpack;(System.Threading.NativeOverlapped*);summary;df-generated |
@@ -48694,11 +48635,9 @@ neutral
 | 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 |
@@ -48818,27 +48757,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 |
@@ -48900,14 +48833,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 |
@@ -49043,6 +48973,7 @@ neutral
 | 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 |
@@ -49087,6 +49018,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 |
@@ -49119,6 +49051,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 |
@@ -49127,6 +49060,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 |
@@ -49234,6 +49169,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 |
@@ -49250,6 +49186,7 @@ neutral
 | 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 |
@@ -49282,6 +49219,8 @@ neutral
 | System.Xml.Schema;XmlSchemaValidator;GetUnspecifiedDefaultAttributes;(System.Collections.ArrayList);summary;df-generated |
 | System.Xml.Schema;XmlSchemaValidator;Initialize;();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;ValidateWhitespace;(System.String);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 |
@@ -49297,6 +49236,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 |
@@ -49309,18 +49249,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 |
@@ -49367,6 +49311,7 @@ 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;CheckReaderCount;(System.Int32,System.Int32);summary;df-generated |
 | System.Xml.Serialization;XmlSerializationReader;CreateAbstractTypeException;(System.String,System.String);summary;df-generated |
@@ -49431,22 +49376,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 |
@@ -49499,6 +49433,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 |
@@ -49595,6 +49530,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 |
@@ -49652,6 +49588,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 |
@@ -49742,6 +49679,7 @@ 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;CreateMtomReader;(System.Byte[],System.Int32,System.Int32,System.Text.Encoding,System.Xml.XmlDictionaryReaderQuotas);summary;df-generated |
@@ -49750,6 +49688,8 @@ neutral
 | 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.Xml.XmlDictionaryReaderQuotas);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.Xml.XmlDictionaryReaderQuotas);summary;df-generated |
 | System.Xml;XmlDictionaryReader;EndCanonicalization;();summary;df-generated |
 | System.Xml;XmlDictionaryReader;IndexOfLocalName;(System.String[],System.String);summary;df-generated |
@@ -49849,34 +49789,18 @@ 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 |
@@ -49915,7 +49839,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 |
@@ -49955,7 +49878,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 |
@@ -50034,7 +49956,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 |
@@ -50085,7 +50006,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 |
@@ -50110,7 +50030,6 @@ neutral
 | 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 |
@@ -50338,8 +50257,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 |
@@ -51370,6 +51289,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 |
@@ -51660,6 +51580,7 @@ neutral
 | System;Environment;get_WorkingSet;();summary;df-generated |
 | System;Exception;GetType;();summary;df-generated |
 | System;Exception;get_Data;();summary;df-generated |
+| System;Exception;get_TargetSite;();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 |
@@ -52928,10 +52849,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 |
@@ -53455,8 +53374,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 |
@@ -54626,6 +54543,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 |
@@ -54640,6 +54558,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..e4622b34a1d 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,59 @@
 | 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[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[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];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[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[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;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 +737,90 @@
 | 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[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[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[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[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[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[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[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 +834,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 +861,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,14 +874,14 @@
 | 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[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[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[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[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[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[1];Argument[1].Parameter[delegate-self];value;hq-generated |
@@ -924,14 +891,14 @@
 | 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[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[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[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[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[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 |
@@ -958,8 +925,7 @@
 | 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 +934,13 @@
 | 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[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[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[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[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,22 +1005,22 @@
 | 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[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[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[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[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[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[2];Argument[2].Parameter[delegate-self];value;hq-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[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[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.DependencyInjection;OptionsServiceCollectionExtensions;PostConfigureAll<TOptions>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<TOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
@@ -1074,57 +1040,53 @@
 | 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[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[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[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[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[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[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[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[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[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[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[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[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[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[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[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[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[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[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[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;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;hq-generated |
@@ -1132,10 +1094,10 @@
 | 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>;(System.Object,System.Func<System.IServiceProvider,System.Object,TService>);Argument[1];Argument[1].Parameter[delegate-self];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;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.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;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;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,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;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;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;hq-generated |
@@ -1144,7 +1106,7 @@
 | 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;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.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.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;hq-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>;(System.Func<System.IServiceProvider,TService>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
@@ -1153,17 +1115,16 @@
 | 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>;(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_ImplementationInstance;();Argument[this].SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationInstance];ReturnValue;value;dfc-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;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[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 +1134,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 +1142,60 @@
 | 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.FileSystemGlobbing;MatcherExtensions;GetResultsInFullPath;(Microsoft.Extensions.FileSystemGlobbing.Matcher,System.String);Argument[1];ReturnValue.Element;taint;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,12 +1210,12 @@
 | 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[1];Argument[1].Parameter[delegate-self];value;hq-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[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[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[1];Argument[1].Parameter[delegate-self];value;hq-generated |
@@ -1256,17 +1224,16 @@
 | 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[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[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[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[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 |
@@ -1279,8 +1246,7 @@
 | 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;ConfigureHostConfiguration;(System.Action<Microsoft.Extensions.Configuration.IConfigurationBuilder>);Argument[0];Argument[0].Parameter[delegate-self];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;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;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;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 |
@@ -1292,69 +1258,68 @@
 | 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[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[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[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[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[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[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[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[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[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[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[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[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[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[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[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[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[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[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[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[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[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[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[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;hq-generated |
 | Microsoft.Extensions.Logging;IExternalScopeProvider;Push;(System.Object);Argument[0];ReturnValue;taint;df-generated |
@@ -1378,19 +1343,19 @@
 | 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[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>;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 |
@@ -1434,7 +1399,8 @@
 | 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>;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>;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>;PostConfigureOptions;(System.String,TDep1,TDep2,TDep3,System.Action<TOptions,TDep1,TDep2,TDep3>);Argument[4];Argument[4].Parameter[delegate-self];value;hq-generated |
@@ -1457,23 +1423,24 @@
 | 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;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 +1496,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 +3004,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 +3609,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 +3747,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 +3772,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 +3981,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 +3994,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 +4047,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,7 +4111,7 @@
 | 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 |
@@ -4169,20 +4128,21 @@
 | 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[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[1];Argument[1].Parameter[delegate-self];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 +4151,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 +4195,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 +4232,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 +4256,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 +4265,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 +4303,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 +4365,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 +4423,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 |
@@ -4450,7 +4444,7 @@
 | 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 +4452,94 @@
 | 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;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;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;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;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>;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>;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>;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;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>;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[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>;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>;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>;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];ReturnValue;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.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>;Sort;(System.Int32,System.Int32,System.Collections.Generic.IComparer<T>);Argument[this];ReturnValue;value;dfc-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 +4552,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 +4576,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,34 +4593,47 @@
 | 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[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];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[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[2];Argument[2].Parameter[delegate-self];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;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[1];Argument[1].Parameter[delegate-self];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;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;hq-generated |
@@ -4665,7 +4680,10 @@
 | 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 |
@@ -4714,10 +4732,10 @@
 | 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;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.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 +4747,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 +4778,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 +4789,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 +4828,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 +4868,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 +4909,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 +4938,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 +4973,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 +4983,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 +5027,13 @@
 | 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;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 |
@@ -5029,16 +5051,14 @@
 | 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 +5075,15 @@
 | 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;CompareAttribute;FormatErrorMessage;(System.String);Argument[this].Property[System.ComponentModel.DataAnnotations.CompareAttribute.OtherPropertyDisplayName];ReturnValue;taint;dfc-generated |
+| System.ComponentModel.DataAnnotations;CompareAttribute;FormatErrorMessage;(System.String);Argument[this].Property[System.ComponentModel.DataAnnotations.CompareAttribute.OtherProperty];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 |
@@ -5071,43 +5093,52 @@
 | 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;RangeAttribute;FormatErrorMessage;(System.String);Argument[this].Property[System.ComponentModel.DataAnnotations.RangeAttribute.Maximum];ReturnValue;taint;dfc-generated |
+| System.ComponentModel.DataAnnotations;RangeAttribute;FormatErrorMessage;(System.String);Argument[this].Property[System.ComponentModel.DataAnnotations.RangeAttribute.Minimum];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;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;hq-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;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 +5148,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 +5206,125 @@
 | 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>;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 +5341,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 +5363,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 +5387,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 +5404,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 +5476,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 +5539,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 +5555,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,12 +5609,12 @@
 | 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 |
@@ -5620,41 +5623,70 @@
 | 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 +5698,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 +5721,102 @@
 | 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;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 +5825,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 +5836,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 +6053,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 +6493,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 +6564,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 +6588,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 |
@@ -6672,15 +6636,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 +6656,23 @@
 | 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;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 +6690,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 +6700,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 +6721,37 @@
 | 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[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;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 +6784,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 +6803,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 +6818,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 |
@@ -6911,29 +6861,27 @@
 | 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 |
@@ -6957,7 +6905,7 @@
 | 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.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 |
@@ -6966,53 +6914,59 @@
 | 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;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 +6983,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 +7001,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,9 +7015,9 @@
 | 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[1];Argument[1].Parameter[delegate-self];value;hq-generated |
@@ -7065,12 +7026,12 @@
 | 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 +7042,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 +7063,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 +7120,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 +7129,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 +7151,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 +7226,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 +7348,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 +7399,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 +7460,79 @@
 | 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;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 +7548,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 +7585,59 @@
 | 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;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 +7652,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 +7676,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 +7711,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 +7728,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 +7738,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 +7760,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 +7781,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 +7806,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 +7847,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 +7897,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 +7940,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 +7964,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 +7981,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 +7997,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 +8018,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 +8075,7 @@
 | 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[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 +8083,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,7 +8203,7 @@
 | 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;Count<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,System.Boolean>);Argument[0].Element;Argument[1].Parameter[0];value;manual |
@@ -8303,9 +8215,9 @@
 | 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[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[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 |
@@ -8320,8 +8232,8 @@
 | 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[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>,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 |
@@ -8410,14 +8322,14 @@
 | 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;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>,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 +8357,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 +8389,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 +8403,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 |
@@ -8531,8 +8441,8 @@
 | 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[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>,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 +8493,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 +8519,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 |
@@ -8639,20 +8552,19 @@
 | 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];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[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[2];Argument[2].Parameter[delegate-self];value;hq-generated |
@@ -8720,7 +8632,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 |
@@ -9106,7 +9018,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 +9041,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 +9050,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 +9125,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 +9163,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 +9175,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 +9210,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 +9237,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 +9259,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 +9271,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 +9315,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 +9331,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 +9422,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 +9439,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 +9447,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 +9488,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 +9504,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 +9559,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 +9603,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 +9643,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 |
@@ -9775,7 +9665,7 @@
 | 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 +9679,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 |
@@ -9823,75 +9706,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 +9737,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 +9761,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 +9778,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,14 +9816,16 @@
 | 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 |
@@ -10059,35 +9855,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 +9898,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 +9907,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 +9968,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 +9982,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 +10078,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 +10141,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 +10159,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 +10195,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 +10221,35 @@
 | 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;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;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;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.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 +10257,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 +10267,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 +10391,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 +10423,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,13 +10441,15 @@
 | 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[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 |
@@ -10712,8 +10469,8 @@
 | 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[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 +10481,50 @@
 | 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;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 +10535,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 |
@@ -10808,11 +10561,8 @@
 | 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 |
@@ -10842,14 +10592,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 |
@@ -10866,70 +10616,77 @@
 | 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[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 +10699,60 @@
 | 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;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;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;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 +10806,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 +10920,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 +10951,83 @@
 | 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;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;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 +11036,59 @@
 | 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;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;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 +11098,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 +11141,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 +11151,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 +11213,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 +11326,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 +11404,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 +11423,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 +11568,87 @@
 | 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;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 +11662,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 +11680,52 @@
 | 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[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[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[2];Argument[2].Parameter[delegate-self];value;hq-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[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[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.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 +11761,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 +11780,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 +11832,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 +11849,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 +11874,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 +11926,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 +11961,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 |
@@ -12212,22 +12023,22 @@
 | 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;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 +12192,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 +12294,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 |
@@ -12624,12 +12437,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 |
@@ -12709,38 +12522,40 @@
 | 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[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 |
@@ -12751,23 +12566,30 @@
 | 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.Object);Argument[0];Argument[0].Parameter[delegate-self];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;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;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[3];Argument[3].Parameter[delegate-self];value;hq-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[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 +12602,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 |
@@ -12794,14 +12618,20 @@
 | 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;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;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 +12660,25 @@
 | 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;hq-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 +12687,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 +12707,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 +12717,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 +12757,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 +12769,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 +12789,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 +12823,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 +12835,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 +12855,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 +12883,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 +12904,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,15 +12925,17 @@
 | 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 |
@@ -13109,8 +12950,8 @@
 | 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 +12962,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 +12991,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 +13010,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 +13030,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 +13039,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 +13051,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 +13059,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 +13070,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 +13078,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 +13087,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 +13101,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,25 +13142,23 @@
 | 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 |
@@ -13354,9 +13177,8 @@
 | 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 +13187,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 +13224,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,19 +13361,17 @@
 | 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 |
@@ -13531,8 +13384,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 +13394,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 +13417,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 +13444,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 +13459,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 +13471,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 +13531,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 +13560,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 +13634,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 +13648,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 +13662,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 +13700,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 +13715,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 +13740,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 +13774,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 +13810,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 +13837,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,8 +13861,8 @@
 | 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];ReturnValue;taint;df-generated |
 | System.Xml;XmlReader;ReadContentAsAsync;(System.Type,System.Xml.IXmlNamespaceResolver);Argument[1];Argument[this];taint;df-generated |
@@ -14035,7 +13905,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 +13914,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 +13989,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 +14035,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 |
@@ -14170,9 +14079,10 @@
 | System;AggregateException;AggregateException;(System.String,System.Exception);Argument[1];Argument[this];taint;df-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;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;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,18 +14101,22 @@
 | 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 |
@@ -14210,8 +14124,8 @@
 | 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[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 |
@@ -14228,29 +14142,35 @@
 | 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[1];Argument[1].Parameter[delegate-self];value;hq-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[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 +14509,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 +14565,24 @@
 | 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;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 +14596,35 @@
 | 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;hq-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.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;(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 +14634,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,16 +14673,16 @@
 | 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;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 |
@@ -14779,57 +14690,73 @@
 | 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 +14764,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 +14779,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 +14799,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 +14855,8 @@
 | 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[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 +14870,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 +14883,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 +14914,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 +14956,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 +15298,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,7 +15319,7 @@
 | 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;hq-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;GetConstructorImpl;(System.Reflection.BindingFlags,System.Reflection.Binder,System.Reflection.CallingConventions,System.Type[],System.Reflection.ParameterModifier[]);Argument[this];ReturnValue;taint;df-generated |
@@ -15395,8 +15329,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 +15345,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 +15361,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 +15555,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/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-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-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-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/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/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-overview/codeql-changelog/codeql-cli-2.19.1.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.19.1.rst
index 5fe18dde3d4..352a229a422 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.19.1.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.19.1.rst
@@ -55,7 +55,7 @@ New Queries
 Python
 """"""
 
-*   The :code:`py/cors-misconfiguration-with-credentials` query, which finds insecure CORS middleware configurations.
+*   The experimental :code:`py/cors-misconfiguration-with-credentials` query, which finds insecure CORS middleware configurations.
 
 Query Metadata Changes
 ~~~~~~~~~~~~~~~~~~~~~~
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/index.rst b/docs/codeql/codeql-overview/codeql-changelog/index.rst
index 4c8d07bd940..349debdf101 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/index.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/index.rst
@@ -11,6 +11,7 @@ A list of queries for each suite and language `is available here <https://docs.g
 .. toctree::
    :maxdepth: 1
 
+   codeql-cli-2.19.2
    codeql-cli-2.19.1
    codeql-cli-2.19.0
    codeql-cli-2.18.4
diff --git a/docs/codeql/reusables/beta-note-threat-models.rst b/docs/codeql/reusables/beta-note-threat-models.rst
index 9fcca40975a..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, C# and Python 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..fd6ca4f220f 100644
--- a/docs/codeql/reusables/supported-platforms.rst
+++ b/docs/codeql/reusables/supported-platforms.rst
@@ -12,9 +12,7 @@
    Windows,"Windows 10 / Windows Server 2019
 
    Windows 11 / Windows Server 2022","x86-64"
-   macOS,"macOS 12 Monterey
-
-   macOS 13 Ventura
+   macOS,"macOS 13 Ventura
 
    macOS 14 Sonoma","x86-64, arm64 (Apple Silicon)
 
diff --git a/docs/codeql/reusables/supported-versions-compilers.rst b/docs/codeql/reusables/supported-versions-compilers.rst
index d9869c35100..4cdb97ace1b 100644
--- a/docs/codeql/reusables/supported-versions-compilers.rst
+++ b/docs/codeql/reusables/supported-versions-compilers.rst
@@ -22,7 +22,7 @@
    Eclipse compiler for Java (ECJ) [6]_",``.java``
    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/extractor/extractor.go b/go/extractor/extractor.go
index c157f7c8f67..bea57eeec8d 100644
--- a/go/extractor/extractor.go
+++ b/go/extractor/extractor.go
@@ -518,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
@@ -1607,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
@@ -1637,7 +1638,7 @@ func extractType(tw *trap.Writer, tp types.Type) trap.Label {
 				// 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)
+				meth := tp.Method(i).Origin()
 
 				// Note that methods do not have a parent scope, so they are
 				// not dealt with by `extractScopes`
@@ -1707,7 +1708,7 @@ 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)
 			}
@@ -1715,7 +1716,7 @@ func extractType(tw *trap.Writer, tp types.Type) trap.Label {
 			// associate all methods of underlying interface with this type
 			if underlyingInterface, ok := underlying.(*types.Interface); ok {
 				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)
 				}
 			}
@@ -1787,7 +1788,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(",")
@@ -2143,3 +2144,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/ql/consistency-queries/CHANGELOG.md b/go/ql/consistency-queries/CHANGELOG.md
index b62e06e3dff..1c514d078a2 100644
--- a/go/ql/consistency-queries/CHANGELOG.md
+++ b/go/ql/consistency-queries/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.11
+
+No user-facing changes.
+
 ## 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/codeql-pack.release.yml b/go/ql/consistency-queries/codeql-pack.release.yml
index 3865dbcf4b2..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.10
+lastReleaseVersion: 1.0.11
diff --git a/go/ql/consistency-queries/qlpack.yml b/go/ql/consistency-queries/qlpack.yml
index 726aa918f89..1e1992b096e 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.10
+version: 1.0.11
 groups:
   - go
   - queries
diff --git a/go/ql/lib/CHANGELOG.md b/go/ql/lib/CHANGELOG.md
index d3c6fcd4a61..37f83fa8dda 100644
--- a/go/ql/lib/CHANGELOG.md
+++ b/go/ql/lib/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 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
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 576c2ea18d6..1a4e53e8772 100644
--- a/go/ql/lib/codeql-pack.release.yml
+++ b/go/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 2.1.1
+lastReleaseVersion: 2.1.2
diff --git a/go/ql/lib/qlpack.yml b/go/ql/lib/qlpack.yml
index ba6a48a29d4..ae83ef10401 100644
--- a/go/ql/lib/qlpack.yml
+++ b/go/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/go-all
-version: 2.1.1
+version: 2.1.2
 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 64c6231d105..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)
   }
 
   /**
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/Scopes.qll b/go/ql/lib/semmle/go/Scopes.qll
index 191534759ea..f9b9e3a26b9 100644
--- a/go/ql/lib/semmle/go/Scopes.qll
+++ b/go/ql/lib/semmle/go/Scopes.qll
@@ -519,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) {
diff --git a/go/ql/lib/semmle/go/Types.qll b/go/ql/lib/semmle/go/Types.qll
index 4818db2f774..1b09ea466cc 100644
--- a/go/ql/lib/semmle/go/Types.qll
+++ b/go/ql/lib/semmle/go/Types.qll
@@ -446,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
@@ -518,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())
     )
@@ -644,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, _, _) }
 
diff --git a/go/ql/lib/semmle/go/controlflow/IR.qll b/go/ql/lib/semmle/go/controlflow/IR.qll
index b036ddf6d0f..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) }
 
diff --git a/go/ql/lib/semmle/go/dataflow/internal/DataFlowImpl1.qll b/go/ql/lib/semmle/go/dataflow/internal/DataFlowImpl1.qll
index ce964917e97..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) {
diff --git a/go/ql/lib/semmle/go/dataflow/internal/DataFlowImpl2.qll b/go/ql/lib/semmle/go/dataflow/internal/DataFlowImpl2.qll
index ce964917e97..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) {
diff --git a/go/ql/lib/semmle/go/dataflow/internal/TaintTrackingUtil.qll b/go/ql/lib/semmle/go/dataflow/internal/TaintTrackingUtil.qll
index 85f6bb0874f..5365228e231 100644
--- a/go/ql/lib/semmle/go/dataflow/internal/TaintTrackingUtil.qll
+++ b/go/ql/lib/semmle/go/dataflow/internal/TaintTrackingUtil.qll
@@ -428,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/src/CHANGELOG.md b/go/ql/src/CHANGELOG.md
index bdb40a2d2bb..0e276fda741 100644
--- a/go/ql/src/CHANGELOG.md
+++ b/go/ql/src/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.1.2
+
+No user-facing changes.
+
 ## 1.1.1
 
 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/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/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 1a19084be3f..53ab127707f 100644
--- a/go/ql/src/codeql-pack.release.yml
+++ b/go/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.1.1
+lastReleaseVersion: 1.1.2
diff --git a/go/ql/src/qlpack.yml b/go/ql/src/qlpack.yml
index 0dbc1fe67fa..aa3b4667330 100644
--- a/go/ql/src/qlpack.yml
+++ b/go/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/go-queries
-version: 1.1.1
+version: 1.1.2
 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/library-tests/semmle/go/PrintAst/PrintAst.expected b/go/ql/test/library-tests/semmle/go/PrintAst/PrintAst.expected
index 41815e473a0..66aa2643063 100644
--- a/go/ql/test/library-tests/semmle/go/PrintAst/PrintAst.expected
+++ b/go/ql/test/library-tests/semmle/go/PrintAst/PrintAst.expected
@@ -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 570ce08f239..099aa4e6144 100644
--- a/go/ql/test/library-tests/semmle/go/PrintAst/PrintAstExcludeComments.expected
+++ b/go/ql/test/library-tests/semmle/go/PrintAst/PrintAstExcludeComments.expected
@@ -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 c8a01b1ba97..9be02352b2b 100644
--- a/go/ql/test/library-tests/semmle/go/PrintAst/PrintAstNestedFunction.expected
+++ b/go/ql/test/library-tests/semmle/go/PrintAst/PrintAstNestedFunction.expected
@@ -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 1981fde0357..45e6789e013 100644
--- a/go/ql/test/library-tests/semmle/go/PrintAst/PrintAstRestrictFile.expected
+++ b/go/ql/test/library-tests/semmle/go/PrintAst/PrintAstRestrictFile.expected
@@ -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 5783960cedc..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,3 +1,9 @@
+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] go.mod
 #    1|   0: [GoModModuleLine] go.mod module line
@@ -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/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.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/query-tests/Security/CWE-918/RequestForgery.expected b/go/ql/test/query-tests/Security/CWE-918/RequestForgery.expected
index 7090a5fa76e..715455ac934 100644
--- a/go/ql/test/query-tests/Security/CWE-918/RequestForgery.expected
+++ b/go/ql/test/query-tests/Security/CWE-918/RequestForgery.expected
@@ -30,7 +30,6 @@ edges
 | 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 |
diff --git a/java/documentation/library-coverage/coverage.csv b/java/documentation/library-coverage/coverage.csv
index 5978894130b..fc3620ca4bc 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,225,,,,,,,,,22,,,,,,,,,,,,,,,44,,,,,,,,,,,,,,,,,,,,,,1,,202,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
@@ -254,8 +252,7 @@ org.springframework.web.reactive.function.client,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..3851cb04166 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,4621,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,26328,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/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 574e11c21b9..cf41f9639cf 100644
--- a/java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt
+++ b/java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt
@@ -169,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)
             }
@@ -478,8 +484,6 @@ open class KotlinFileExtractor(
                 tw.writeIsRaw(id)
             }
 
-            val unbound = useClassSource(c)
-            tw.writeErasure(id, unbound)
             extractClassModifiers(c, id)
             extractClassSupertypes(
                 c,
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/ql/automodel/src/CHANGELOG.md b/java/ql/automodel/src/CHANGELOG.md
index 537e84b2c0e..148791b5923 100644
--- a/java/ql/automodel/src/CHANGELOG.md
+++ b/java/ql/automodel/src/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.11
+
+No user-facing changes.
+
 ## 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/codeql-pack.release.yml b/java/ql/automodel/src/codeql-pack.release.yml
index 3865dbcf4b2..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.10
+lastReleaseVersion: 1.0.11
diff --git a/java/ql/automodel/src/qlpack.yml b/java/ql/automodel/src/qlpack.yml
index 7621f1900d5..089cecea424 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.10
+version: 1.0.11
 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/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 6be0cdc10e5..cddb86232c4 100644
--- a/java/ql/lib/CHANGELOG.md
+++ b/java/ql/lib/CHANGELOG.md
@@ -1,3 +1,13 @@
+## 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.
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 9c871cefc42..9fc6933b429 100644
--- a/java/ql/lib/codeql-pack.release.yml
+++ b/java/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 4.1.1
+lastReleaseVersion: 4.2.0
diff --git a/java/ql/lib/config/semmlecode.dbscheme b/java/ql/lib/config/semmlecode.dbscheme
index 876cabc76c5..1fd1afa7862 100644
--- a/java/ql/lib/config/semmlecode.dbscheme
+++ b/java/ql/lib/config/semmlecode.dbscheme
@@ -516,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 18f6ac5b4a8..a6b93ae7405 100644
--- a/java/ql/lib/config/semmlecode.dbscheme.stats
+++ b/java/ql/lib/config/semmlecode.dbscheme.stats
@@ -13843,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/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..1a30e31273f 100644
--- a/java/ql/lib/ext/java.io.model.yml
+++ b/java/ql/lib/ext/java.io.model.yml
@@ -100,6 +100,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.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.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..51957db1e90 100644
--- a/java/ql/lib/ext/java.util.zip.model.yml
+++ b/java/ql/lib/ext/java.util.zip.model.yml
@@ -5,7 +5,20 @@ 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
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/qlpack.yml b/java/ql/lib/qlpack.yml
index 8b7c059ba59..28a0313b385 100644
--- a/java/ql/lib/qlpack.yml
+++ b/java/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/java-all
-version: 4.1.1
+version: 4.2.0
 groups: java
 dbscheme: config/semmlecode.dbscheme
 extractor: java
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/dataflow/internal/DataFlowImpl1.qll b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl1.qll
index ce964917e97..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) {
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 ce964917e97..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) {
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 ce964917e97..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) {
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 ce964917e97..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) {
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 ce964917e97..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) {
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 ce964917e97..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) {
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 4984b8b050f..ad770b75a3e 100644
--- a/java/ql/lib/semmle/code/java/dataflow/internal/TaintTrackingUtil.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/internal/TaintTrackingUtil.qll
@@ -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/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/CHANGELOG.md b/java/ql/src/CHANGELOG.md
index a034dc0abf9..3a29e9e55e0 100644
--- a/java/ql/src/CHANGELOG.md
+++ b/java/ql/src/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.1.8
+
+No user-facing changes.
+
 ## 1.1.7
 
 No user-facing changes.
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/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 75910556516..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.7
+lastReleaseVersion: 1.1.8
diff --git a/java/ql/src/qlpack.yml b/java/ql/src/qlpack.yml
index 82b14986199..5664bb64aa1 100644
--- a/java/ql/src/qlpack.yml
+++ b/java/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/java-queries
-version: 1.1.7
+version: 1.1.8
 groups:
   - java
   - queries
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/library-tests/dataflow/taint-format/test.expected b/java/ql/test/library-tests/dataflow/taint-format/test.expected
index 15e37b39dee..81fcbca61db 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.util; Formatter; false; format; (String,Object[]); ; Argument[this]; ReturnValue; value; dfc-generated |
+| 2 | Summary: java.lang; AbstractStringBuilder; true; append; ; ; Argument[this]; ReturnValue; value; manual |
+| 3 | Summary: java.lang; AbstractStringBuilder; true; append; ; ; Argument[0]; Argument[this]; taint; manual |
+| 4 | Summary: java.lang; CharSequence; true; toString; ; ; Argument[this]; ReturnValue; taint; manual |
+| 5 | Summary: java.lang; String; false; format; (String,Object[]); ; Argument[1].ArrayElement; ReturnValue; taint; manual |
+| 6 | Summary: java.lang; String; false; formatted; (Object[]); ; Argument[this]; ReturnValue; taint; manual |
+| 7 | Summary: java.lang; String; false; formatted; (Object[]); ; Argument[0].ArrayElement; ReturnValue; taint; manual |
 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:7 |
 | 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:5 |
 | 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:5 |
 | 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:4 |
+| A.java:38:14:38:15 | sb : StringBuilder | A.java:38:14:38:26 | toString(...) | provenance | MaD:4 |
 | 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:3 |
+| A.java:45:24:45:26 | bad : String | A.java:45:14:45:27 | append(...) | provenance | MaD:3+MaD:2 |
+| A.java:47:14:47:30 | new Formatter(...) : Formatter | A.java:47:14:47:43 | format(...) : Formatter | provenance | MaD:1 |
 | 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/frameworks/jdk/java.net/test.expected b/java/ql/test/library-tests/frameworks/jdk/java.net/test.expected
index 1e386a76c8f..0d90276374b 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 |
@@ -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 |  |
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-090/LdapInjection.expected b/java/ql/test/query-tests/security/CWE-090/LdapInjection.expected
index 752cd0bdfeb..f75b9f214e6 100644
--- a/java/ql/test/query-tests/security/CWE-090/LdapInjection.expected
+++ b/java/ql/test/query-tests/security/CWE-090/LdapInjection.expected
@@ -59,46 +59,45 @@
 | 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:11 |
+| LdapInjection.java:45:55:45:81 | jBadDN : String | LdapInjection.java:47:16:47:35 | ... + ... | provenance | Sink:MaD:11 |
+| LdapInjection.java:51:28:51:52 | jBad : String | LdapInjection.java:53:56:53:75 | ... + ... | provenance | Sink:MaD:11 |
 | 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:11 |
+| LdapInjection.java:53:29:53:52 | ... + ... : String | LdapInjection.java:53:16:53:53 | new LdapName(...) | provenance | MaD:7 Sink:MaD:11 |
+| LdapInjection.java:57:28:57:52 | jBad : String | LdapInjection.java:59:63:59:82 | ... + ... | provenance | Sink:MaD:11 |
+| LdapInjection.java:63:28:63:59 | jBadInitial : String | LdapInjection.java:65:29:65:55 | ... + ... | provenance | Sink:MaD:11 |
+| LdapInjection.java:69:28:69:52 | jBad : String | LdapInjection.java:71:84:71:103 | ... + ... | provenance | Sink:MaD:11 |
 | 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:8 Sink:MaD:11 |
 | 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:11 |
 | 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:7 |
+| LdapInjection.java:75:28:75:52 | jBad : String | LdapInjection.java:79:47:79:66 | ... + ... | provenance | Sink:MaD:11 |
 | 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:7 |
+| LdapInjection.java:79:16:79:31 | new LdapName(...) : LdapName | LdapInjection.java:79:16:79:44 | addAll(...) | provenance | MaD:8 Sink:MaD:11 |
 | 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:11 |
+| LdapInjection.java:83:28:83:52 | jBad : String | LdapInjection.java:85:75:85:94 | ... + ... | provenance | Sink:MaD:11 |
 | 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:11 |
 | 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:7 |
+| LdapInjection.java:89:28:89:52 | jBad : String | LdapInjection.java:91:76:91:95 | ... + ... | provenance | Sink:MaD:11 |
 | 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:11 |
 | 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:7 |
 | 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: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:10 Sink:MaD:11 |
+| LdapInjection.java:101:63:101:74 | jOkAttribute : String | LdapInjection.java:101:29:101:75 | new BasicAttributes(...) | provenance | MaD:10 Sink:MaD:11 |
 | 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 |  |
@@ -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:9 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 |
@@ -150,68 +149,68 @@ edges
 | 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: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:17 |
+| LdapInjection.java:229:57:229:83 | sBadDN : String | LdapInjection.java:230:14:230:33 | ... + ... | provenance | Sink:MaD:17 |
+| LdapInjection.java:234:30:234:54 | sBad : String | LdapInjection.java:235:88:235:107 | ... + ... | provenance | Sink:MaD:14 |
 | 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:14 |
 | 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:19 |
 | 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:15 |
-| LdapInjection.java:240:23:240:89 | add(...) : LdapNameBuilder | LdapInjection.java:240:23:240:97 | build(...) | provenance | Config Sink:MaD:21 |
+| LdapInjection.java:240:23:240:89 | add(...) : LdapNameBuilder | LdapInjection.java:240:23:240:97 | build(...) | provenance | Config Sink:MaD:13 |
+| LdapInjection.java:240:23:240:89 | add(...) : LdapNameBuilder | LdapInjection.java:240:23:240:97 | build(...) | provenance | Config Sink:MaD:19 |
 | 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:16 |
 | 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:15 |
+| LdapInjection.java:250:86:250:111 | ... + ... : String | LdapInjection.java:250:66:250:112 | new HardcodedFilter(...) | provenance | Config Sink:MaD:15 |
 | 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:18 |
 | 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:18 |
 | 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:18 |
 | 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:18 |
 | 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:15 |
 | 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:18 |
 | 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:17 |
 | 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:9 Sink:MaD:17 |
+| LdapInjection.java:314:30:314:54 | aBad : String | LdapInjection.java:316:36:316:55 | ... + ... | provenance | Sink:MaD:12 |
+| LdapInjection.java:314:57:314:83 | aBadDN : String | LdapInjection.java:316:14:316:33 | ... + ... | provenance | Sink:MaD:12 |
+| LdapInjection.java:320:30:320:54 | aBad : String | LdapInjection.java:322:65:322:84 | ... + ... | provenance | Sink:MaD:12 |
 | 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:12 |
 | 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:12 |
 | 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:12 |
 | 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:12 |
 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 | Summary: javax.naming.ldap; LdapName; true; LdapName; (String); ; Argument[0]; Argument[this]; taint; df-generated |
+| 8 | Summary: javax.naming; Name; true; addAll; (Name); ; Argument[this]; ReturnValue; value; dfc-generated |
+| 9 | Summary: java.lang; CharSequence; true; toString; ; ; Argument[this]; ReturnValue; taint; manual |
+| 10 | Summary: javax.naming.directory; BasicAttributes; true; BasicAttributes; (String,Object); ; Argument[0..1]; Argument[this]; taint; manual |
+| 11 | Sink: javax.naming.directory; DirContext; true; search; ; ; Argument[0..1]; ldap-injection; manual |
+| 12 | Sink: org.apache.directory.ldap.client.api; LdapConnection; true; search; ; ; Argument[0..2]; ldap-injection; manual |
+| 13 | Sink: org.springframework.ldap.core; LdapOperations; true; searchForObject; (Name,String,ContextMapper); ; Argument[0]; jndi-injection; manual |
+| 14 | Sink: org.springframework.ldap.core; LdapTemplate; false; authenticate; (Name,String,String); ; Argument[0..1]; ldap-injection; manual |
+| 15 | Sink: org.springframework.ldap.core; LdapTemplate; false; find; ; ; Argument[0..1]; ldap-injection; manual |
+| 16 | Sink: org.springframework.ldap.core; LdapTemplate; false; findOne; ; ; Argument[0..1]; ldap-injection; manual |
+| 17 | Sink: org.springframework.ldap.core; LdapTemplate; false; search; ; ; Argument[0..1]; ldap-injection; manual |
+| 18 | Sink: org.springframework.ldap.core; LdapTemplate; false; searchForContext; ; ; Argument[0..1]; ldap-injection; manual |
+| 19 | Sink: org.springframework.ldap.core; LdapTemplate; false; searchForObject; ; ; Argument[0..1]; ldap-injection; manual |
 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-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/p/MultiPaths.java b/java/ql/test/utils/modelgenerator/dataflow/p/MultiPaths.java
index b2833abad02..827346604df 100644
--- a/java/ql/test/utils/modelgenerator/dataflow/p/MultiPaths.java
+++ b/java/ql/test/utils/modelgenerator/dataflow/p/MultiPaths.java
@@ -10,4 +10,10 @@ public class MultiPaths {
     }
     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/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 6068cf26319..50d1486c006 100644
--- a/javascript/ql/lib/CHANGELOG.md
+++ b/javascript/ql/lib/CHANGELOG.md
@@ -1,3 +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.
+
 ## 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 81c7f1dbc13..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.2
+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 8cf13a5240c..66b9824a552 100644
--- a/javascript/ql/lib/qlpack.yml
+++ b/javascript/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/javascript-all
-version: 2.0.2
+version: 2.1.0
 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/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/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 df7becd46de..9a9a4641c6e 100644
--- a/javascript/ql/src/CHANGELOG.md
+++ b/javascript/ql/src/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.2.3
+
+No user-facing changes.
+
 ## 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 0a70a9a01a7..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.2
+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 5aee59e9b01..87d4c9906ac 100644
--- a/javascript/ql/src/qlpack.yml
+++ b/javascript/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/javascript-queries
-version: 1.2.2
+version: 1.2.3
 groups:
   - javascript
   - queries
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/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-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/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/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/codegen/lib/schemadefs.py b/misc/codegen/lib/schemadefs.py
index ea8d6cf09ce..997b85b4ca6 100644
--- a/misc/codegen/lib/schemadefs.py
+++ b/misc/codegen/lib/schemadefs.py
@@ -1,6 +1,7 @@
 from typing import (
     Callable as _Callable,
     Dict as _Dict,
+    Iterable as _Iterable,
     ClassVar as _ClassVar,
 )
 from misc.codegen.lib import schema as _schema
@@ -278,7 +279,7 @@ _ = _PropertyAnnotation()
 drop = object()
 
 
-def annotate(annotated_cls: type, replace_bases: _Dict[type, type] | None = None) -> _Callable[[type], _PropertyAnnotation]:
+def annotate(annotated_cls: type, add_bases: _Iterable[type] | None = None, replace_bases: _Dict[type, type] | None = None) -> _Callable[[type], _PropertyAnnotation]:
     """
     Add or modify schema annotations after a class has been defined previously.
 
@@ -295,6 +296,8 @@ def annotate(annotated_cls: type, replace_bases: _Dict[type, type] | None = None
             _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))
diff --git a/misc/codegen/test/test_schemaloader.py b/misc/codegen/test/test_schemaloader.py
index 0c9128c7272..6c6fccfb3ea 100644
--- a/misc/codegen/test/test_schemaloader.py
+++ b/misc/codegen/test/test_schemaloader.py
@@ -914,6 +914,36 @@ def test_annotate_replace_bases():
     }
 
 
+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:
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/suite-helpers/CHANGELOG.md b/misc/suite-helpers/CHANGELOG.md
index e9c580c60ce..0992e6bd9c5 100644
--- a/misc/suite-helpers/CHANGELOG.md
+++ b/misc/suite-helpers/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.11
+
+No user-facing changes.
+
 ## 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/codeql-pack.release.yml b/misc/suite-helpers/codeql-pack.release.yml
index 3865dbcf4b2..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.10
+lastReleaseVersion: 1.0.11
diff --git a/misc/suite-helpers/qlpack.yml b/misc/suite-helpers/qlpack.yml
index 6b8eb63063b..ef23a7273c3 100644
--- a/misc/suite-helpers/qlpack.yml
+++ b/misc/suite-helpers/qlpack.yml
@@ -1,4 +1,4 @@
 name: codeql/suite-helpers
-version: 1.0.10
+version: 1.0.11
 groups: shared
 warnOnImplicitThis: true
diff --git a/powershell/codeql-extractor.yml b/powershell/codeql-extractor.yml
index 43cd6f6dc95..f9730fd4396 100644
--- a/powershell/codeql-extractor.yml
+++ b/powershell/codeql-extractor.yml
@@ -3,8 +3,17 @@ display_name: "powershell"
 version: 0.0.1
 column_kind: "utf16"
 legacy_qltest_extraction: true
+build_modes:
+  - none
 file_types:
   - name: powershell
     display_name: powershellscripts
     extensions:
-      - .ps1
\ No newline at end of file
+      - .ps1
+      - .psd1
+options:
+  skip_psmodulepath_files:
+    title: Skip PSModulePath files.
+    description: Whether to avoid extracting source files in paths specified by the PSModulePath environment variable.
+    type: string
+    pattern: "^(false|true)$"
\ No newline at end of file
diff --git a/powershell/downgrades/c5191f89a6e3e8cea428b5c7326a06e335738533/old.dbscheme b/powershell/downgrades/c5191f89a6e3e8cea428b5c7326a06e335738533/old.dbscheme
new file mode 100644
index 00000000000..c5191f89a6e
--- /dev/null
+++ b/powershell/downgrades/c5191f89a6e3e8cea428b5c7326a06e335738533/old.dbscheme
@@ -0,0 +1,1652 @@
+/* Mandatory */
+sourceLocationPrefix(
+  varchar(900) prefix: string ref
+);
+
+/* Entity Locations */
+@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
+);
+
+/* File Metadata */
+
+numlines(
+  unique int element_id: @file ref,
+  int num_lines: int ref,
+  int num_code: int ref,
+  int num_comment: int ref
+);
+
+files(
+  unique int id: @file,
+  varchar(900) name: string ref
+);
+
+folders(
+  unique int id: @folder,
+  varchar(900) name: string ref
+);
+
+@container = @folder | @file;
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref
+);
+
+is_in_psmodule_path(
+  int file: @file ref
+);
+
+/* Comments */
+comment_entity(
+  unique int id: @comment_entity,
+  int text: @string_literal ref
+);
+
+comment_entity_location(
+  unique int id: @comment_entity ref,
+  int loc: @location ref
+);
+
+/* Messages */
+extractor_messages(
+  unique int id: @extractor_message,
+  int severity: int ref,
+  string origin : string ref,
+  string text : string ref,
+  string entity : string ref,
+  int location: @location_default ref,
+  string stack_trace : string ref
+);
+
+parent(
+  int child: @ast ref,
+  int parent: @ast ref
+);
+
+/* AST Nodes */
+// This is all the kinds of nodes that can inherit from Ast
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.ast?view=powershellsdk-7.3.0
+@ast = @not_implemented | @attribute_base | @catch_clause | @command_element |
+@member | @named_block | @param_block | @parameter | @redirection | @script_block | @statement | @statement_block | @named_attribute_argument;
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.attributebaseast?view=powershellsdk-7.2.0
+@attribute_base = @attribute | @type_constraint;
+
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.memberast?view=powershellsdk-7.3.0
+@member = @function_member | @property_member;
+
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.commandbaseast?view=powershellsdk-7.3.0
+@command_base = @command | @command_expression;
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.chainableast?view=powershellsdk-7.3.0
+@chainable = @command_base | @pipeline | @pipeline_chain;
+//https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.pipelinebaseast?view=powershellsdk-7.3.0
+@pipeline_base = @chainable | @error_statement | @assignment_statement;
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.statementast?view=powershellsdk-7.3.0
+@statement = @block_statement 
+| @break_statement 
+| @command_base
+| @configuration_definition 
+| @continue_statement 
+| @data_statement 
+| @dynamic_keyword_statement 
+| @exit_statement 
+| @function_definition 
+| @if_statement 
+| @labeled_statement 
+| @pipeline_base
+| @return_statement 
+| @throw_statement 
+| @trap_statement 
+| @try_statement 
+| @type_definition
+| @using_statement;
+
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.loopstatementast?view=powershellsdk-7.3.0
+@loop_statement = @do_until_statement | @do_while_statement | @foreach_statement | @for_statement | @while_statement;
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.labeledstatementast?view=powershellsdk-7.3.0
+@labeled_statement = @loop_statement | @switch_statement;
+
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.attributedexpressionast?view=powershellsdk-7.3.0
+@attributed_expression_ast = @attributed_expression | @convert_expression;
+
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.memberexpressionast?view=powershellsdk-7.3.0
+@member_expression_base = @member_expression | @invoke_member_expression; // | @base_ctor_invoke_member_expression
+
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.expressionast?view=powershellsdk-7.3.0
+@expression = @array_expression
+| @array_literal
+| @attributed_expression_ast
+| @binary_expression
+| @error_expression
+| @expandable_string_expression
+| @hash_table
+| @index_expression
+| @member_expression_base
+| @paren_expression
+| @script_block_expression
+| @sub_expression
+| @ternary_expression
+| @type_expression
+| @unary_expression
+| @using_expression
+| @variable_expression
+| @base_constant_expression;
+
+// Constant expression can both be instanced and extended by string constant expression
+@base_constant_expression = @constant_expression | @string_constant_expression;
+
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.commandelementast?view=powershellsdk-7.3.0
+@command_element = @expression | @command_parameter;
+
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.redirectionast?view=powershellsdk-7.3.0
+@redirection = @file_redirection | @merging_redirection;
+
+/** 
+Entries in this table indicate visited C# powershell ast objects which don't have parsing implemented yet.  
+
+You can obtain the Type of the C# AST objects which don't yet have an associated entity to parse them
+ using this QL query on an extracted db:
+
+from string s
+where not_implemented(_, s)
+select s
+*/
+not_implemented(
+  unique int id: @not_implemented,
+  string name: string ref
+);
+
+not_implemented_location(
+  int id: @not_implemented ref,
+  int loc: @location ref
+);
+
+// ArrayExpressionAst 
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.arrayexpressionast?view=powershellsdk-7.3.0
+array_expression(
+  unique int id: @array_expression,
+  int subExpression: @statement_block ref
+)
+
+array_expression_location(
+  int id: @array_expression ref,
+  int loc: @location ref
+)
+
+// ArrayLiteralAst 
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.arrayliteralast?view=powershellsdk-7.3.0
+array_literal(
+  unique int id: @array_literal
+)
+
+array_literal_location(
+  int id: @array_literal ref,
+  int loc: @location ref
+)
+
+array_literal_element(
+  int id: @array_literal ref,
+  int index: int ref,
+  int component: @expression ref
+)
+
+// AssignmentStatementAst 
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.assignmentstatementast?view=powershellsdk-7.3.0
+// https://github.com/PowerShell/PowerShell/blob/48c9d683565ed9402430a27e09410d56d52d4bfd/src/System.Management.Automation/engine/parser/Compiler.cs#L983-L989
+assignment_statement(
+  unique int id: @assignment_statement,
+  int kind: int ref, // @token_kind ref
+  int left: @expression ref,
+  int right: @statement ref
+)
+
+assignment_statement_location(
+  int id: @assignment_statement ref,
+  int loc: @location ref
+)
+
+// NamedBlockAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.namedblockast?view=powershellsdk-7.3.0
+named_block(
+  unique int id: @named_block,
+  int numStatements: int ref,
+  int numTraps: int ref
+)
+
+named_block_statement(
+  int id: @named_block ref,
+  int index: int ref,
+  int statement: @statement ref
+)
+
+named_block_trap(
+  int id: @named_block ref,
+  int index: int ref,
+  int trap: @trap_statement ref
+)
+
+named_block_location(
+  int id: @named_block ref,
+  int loc: @location ref
+)
+
+// ScriptBlockAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.scriptblockast?view=powershellsdk-7.3.0
+script_block(
+  unique int id: @script_block,
+  int numUsings: int ref,
+  int numRequiredModules: int ref,
+  int numRequiredAssemblies: int ref,
+  int numRequiredPsEditions: int ref,
+  int numRequiredPsSnapins: int ref
+)
+
+script_block_param_block(
+  int id: @script_block ref,
+  int the_param_block: @param_block ref
+)
+
+script_block_begin_block(
+  int id: @script_block ref,
+  int begin_block: @named_block ref
+)
+
+script_block_clean_block(
+  int id: @script_block ref,
+  int clean_block: @named_block ref
+)
+
+script_block_dynamic_param_block(
+  int id: @script_block ref,
+  int dynamic_param_block: @named_block ref
+)
+
+script_block_end_block(
+  int id: @script_block ref,
+  int end_block: @named_block ref
+)
+
+script_block_process_block(
+  int id: @script_block ref,
+  int process_block: @named_block ref
+)
+
+script_block_using(
+  int id: @script_block ref,
+  int index: int ref,
+  int using: @ast ref
+)
+
+script_block_required_application_id(
+  int id: @script_block ref,
+  string application_id: string ref
+)
+
+script_block_requires_elevation(
+  int id: @script_block ref,
+  boolean requires_elevation: boolean ref
+)
+
+script_block_required_ps_version(
+  int id: @script_block ref,
+  string required_ps_version: string ref
+)
+
+script_block_required_module(
+  int id: @script_block ref,
+  int index: int ref,
+  int required_module: @module_specification ref
+)
+
+script_block_required_assembly(
+  int id: @script_block ref,
+  int index: int ref,
+  string required_assembly: string ref
+)
+
+script_block_required_ps_edition(
+  int id: @script_block ref,
+  int index: int ref,
+  string required_ps_edition: string ref
+)
+
+script_block_requires_ps_snapin(
+  int id: @script_block ref,
+  int index: int ref,
+  string name: string ref,
+  string version: string ref
+)
+
+script_block_location(
+  int id: @script_block ref,
+  int loc: @location ref
+)
+
+// ModuleSpecification
+// https://learn.microsoft.com/en-us/dotnet/api/microsoft.powershell.commands.modulespecification?view=powershellsdk-7.3.0
+module_specification(
+  unique int id: @module_specification,
+  string name: string ref,
+  string guid: string ref,
+  string maxVersion: string ref,
+  string requiredVersion: string ref,
+  string version: string ref
+)
+
+// BinaryExpressionAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.binaryexpressionast?view=powershellsdk-7.3.0
+// https://github.com/PowerShell/PowerShell/blob/48c9d683565ed9402430a27e09410d56d52d4bfd/src/System.Management.Automation/engine/parser/Compiler.cs#L5675-L5947
+binary_expression(
+  unique int id: @binary_expression,
+  int kind: int ref, // @token_kind ref
+  int left: @expression ref,
+  int right: @expression ref
+)
+
+// @binary_expression_kind = @And | @Is | @IsNot | @As | @DotDot | @Multiply | @Divide | @Rem | @Plus | @Minus | @Format | @Xor | @Shl | @Shr | @Band | @Bor | @Bxor | @Join | @Ieq | @Ine | @Ige | @Igt | @Ilt | @Ile | @Ilike | @Inotlike | @Inotmatch | @Imatch | @Ireplace | @Inotcontains | @Icontains | @Iin | @Inotin | @Isplit | @Ceq | @Cge | @Cgt | @Clt | @Cle | @Clike | @Cnotlike | @Cnotmatch | @Cmatch | @Ccontains | @Creplace | @Cin | @Cnotin | @Csplit | @QuestionQuestion;
+
+binary_expression_location(
+  int id: @binary_expression ref,
+  int loc: @location ref
+)
+
+// ConstantExpressionAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.constantexpressionast?view=powershellsdk-7.3.0
+constant_expression(
+  unique int id: @constant_expression,
+  string staticType: string ref
+)
+
+constant_expression_value(
+  int id: @constant_expression ref,
+  int value: @string_literal ref
+)
+
+constant_expression_location(
+  int id: @constant_expression ref,
+  int loc: @location ref
+)
+
+// ConvertExpressionAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.convertexpressionast?view=powershellsdk-7.3.0
+convert_expression(
+  unique int id: @convert_expression,
+  int the_attribute: @ast ref,
+  int child: @ast ref,
+  int object_type: @ast ref,
+  string staticType: string ref
+)
+
+convert_expression_location(
+  int id: @convert_expression ref,
+  int loc: @location ref
+)
+
+// IndexExpressionAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.indexexpressionast?view=powershellsdk-7.3.0
+index_expression(
+  unique int id: @index_expression,
+  int index: @ast ref,
+  int target: @ast ref,
+  boolean nullConditional: boolean ref
+)
+
+index_expression_location(
+  int id: @index_expression ref,
+  int loc: @location ref
+)
+
+// IfStatementAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.ifstatementast?view=powershellsdk-7.3.0
+if_statement(
+  unique int id: @if_statement
+)
+
+if_statement_clause(
+  int id: @if_statement ref,
+  int index: int ref,
+  int item1: @pipeline_base ref,
+  int item2: @statement_block ref
+)
+
+if_statement_else(
+  int id: @if_statement ref,
+  int elseItem: @statement_block ref 
+)
+
+if_statement_location(
+  int id: @if_statement ref,
+  int loc: @location ref
+)
+
+// MemberExpressionAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.memberexpressionast?view=powershellsdk-7.3.0
+member_expression(
+  unique int id: @member_expression,
+  int expression: @ast ref,
+  int member: @ast ref,
+  boolean nullConditional: boolean ref,
+  boolean isStatic: boolean ref
+)
+
+member_expression_location(
+  int id: @member_expression ref,
+  int loc: @location ref
+)
+
+// StatementBlockAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.statementblockast?view=powershellsdk-7.3.0
+statement_block(
+  unique int id: @statement_block,
+  int numStatements: int ref,
+  int numTraps : int ref
+)
+
+statement_block_location(
+  int id: @statement_block ref,
+  int loc: @location ref
+)
+
+statement_block_statement(
+  int id: @statement_block ref,
+  int index: int ref,
+  int statement: @statement ref
+)
+
+statement_block_trap(
+  int id: @statement_block ref,
+  int index: int ref,
+  int trap: @trap_statement ref
+)
+
+// SubExpressionAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.subexpressionast?view=powershellsdk-7.3.0
+sub_expression(
+  unique int id: @sub_expression,
+  int subExpression: @statement_block ref
+)
+
+sub_expression_location(
+  int id: @sub_expression ref,
+  int loc: @location ref
+)
+
+// VariableExpressionAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.variableexpressionast?view=powershellsdk-7.3.0
+variable_expression(
+  unique int id: @variable_expression,
+  string userPath: string ref,
+  string driveName: string ref,
+  boolean isConstant: boolean ref,
+  boolean isGlobal: boolean ref,
+  boolean isLocal: boolean ref,
+  boolean isPrivate: boolean ref,
+  boolean isScript: boolean ref,
+  boolean isUnqualified: boolean ref,
+  boolean isUnscoped: boolean ref,
+  boolean isVariable: boolean ref,
+  boolean isDriveQualified: boolean ref
+)
+
+variable_expression_location(
+  int id: @variable_expression ref,
+  int loc: @location ref
+)
+
+// CommandExpressionAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.commandexpressionast?view=powershellsdk-7.3.0
+command_expression(
+  unique int id: @command_expression,
+  int wrapped: @expression ref,
+  int numRedirections: int ref
+)
+
+command_expression_location(
+  int id: @command_expression ref,
+  int loc: @location ref
+)
+
+command_expression_redirection(
+  int id: @command_expression ref,
+  int index: int ref,
+  int redirection: @redirection ref
+)
+
+// StringConstantExpressionAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.stringconstantexpressionast?view=powershellsdk-7.3.0
+string_constant_expression(
+  unique int id: @string_constant_expression,
+  int value: @string_literal ref
+)
+
+string_constant_expression_location(
+  int id: @string_constant_expression ref,
+  int loc: @location ref
+)
+
+// PipelineAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.pipelineast?view=powershellsdk-7.3.0
+pipeline(
+  unique int id: @pipeline,
+  int numComponents: int ref
+)
+
+pipeline_location(
+  int id: @pipeline ref,
+  int loc: @location ref
+)
+
+pipeline_component(
+  int id: @pipeline ref,
+  int index: int ref,
+  int component: @command_base ref
+)
+
+// CommandAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.commandast?view=powershellsdk-7.3.0
+command(
+  unique int id: @command,
+  string name: string ref,
+  int kind: int ref, // @token_kind ref
+  int numElements: int ref,
+  int numRedirections: int ref
+)
+
+command_location(
+  int id: @command ref,
+  int loc: @location ref
+)
+
+command_command_element(
+  int id: @command ref,
+  int index: int ref,
+  int component: @command_element ref
+)
+
+command_redirection(
+  int id: @command ref,
+  int index: int ref,
+  int redirection: @redirection ref
+)
+
+// InvokeMemberExpressionAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.invokememberexpressionast?view=powershellsdk-7.3.0
+invoke_member_expression(
+  unique int id: @invoke_member_expression,
+  int expression: @expression ref,
+  int member: @command_element ref
+)
+
+invoke_member_expression_location(
+  int id: @invoke_member_expression ref,
+  int loc: @location ref
+)
+
+invoke_member_expression_argument(
+  int id: @invoke_member_expression ref,
+  int index: int ref,
+  int argument: @expression ref
+)
+
+// ParenExpressionAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.parenexpressionast?view=powershellsdk-7.3.0
+paren_expression(
+  unique int id: @paren_expression,
+  int expression: @pipeline_base ref
+)
+
+paren_expression_location(
+  int id: @paren_expression ref,
+  int loc: @location ref
+)
+
+
+// TernaryStatementAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.ternaryexpressionast?view=powershellsdk-7.3.0
+ternary_expression(
+  unique int id: @ternary_expression, 
+  int condition: @expression ref,
+  int ifFalse: @expression ref,
+  int iftrue: @expression ref
+)
+
+ternary_expression_location(
+  int id: @ternary_expression ref,
+  int loc: @location ref
+)
+
+// ExitStatementAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.exitstatementast?view=powershellsdk-7.3.0
+exit_statement(
+  unique int id: @exit_statement
+)
+
+exit_statement_pipeline(
+  int id: @exit_statement ref,
+  int expression: @pipeline_base ref
+)
+
+exit_statement_location(
+  int id: @exit_statement ref,
+  int loc: @location ref
+)
+
+
+// TypeExpressionAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.typeexpressionast?view=powershellsdk-7.3.0
+type_expression(
+  unique int id: @type_expression,
+  string name: string ref,
+  string fullName: string ref
+)
+
+type_expression_location(
+  int id: @type_expression ref,
+  int loc: @location ref
+)
+
+// CommandParameterAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.commandparameterast?view=powershellsdk-7.3.0
+command_parameter(
+  unique int id: @command_parameter,
+  string name: string ref
+)
+
+command_parameter_location(
+  int id: @command_parameter ref,
+  int loc: @location ref
+)
+
+command_parameter_argument(
+  int id: @command_parameter ref,
+  int argument: @ast ref
+)
+
+// NamedAttributeArgumentAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.namedattributeargumentast?view=powershellsdk-7.3.0
+named_attribute_argument(
+  unique int id: @named_attribute_argument,
+  string name: string ref,
+  int argument: @expression ref
+)
+
+named_attribute_argument_location(
+  int id: @named_attribute_argument ref,
+  int loc: @location ref
+)
+
+// AttributeAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.attributeast?view=powershellsdk-7.3.0
+attribute(
+  unique int id: @attribute,
+  string name: string ref,
+  int numNamedArguments: int ref,
+  int numPositionalArguments: int ref
+)
+
+attribute_named_argument(
+  int id: @attribute ref,
+  int index: int ref,
+  int argument: @named_attribute_argument ref
+)
+
+attribute_positional_argument(
+  int id: @attribute ref,
+  int index: int ref,
+  int argument: @expression ref
+)
+
+attribute_location(
+  int id: @attribute ref,
+  int id: @location ref
+)
+
+// ParamBlockAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.paramblockast?view=powershellsdk-7.3.0
+param_block(
+  unique int id: @param_block,
+  int numAttributes: int ref,
+  int numParameters: int ref
+)
+
+param_block_attribute(
+  int id: @param_block ref,
+  int index: int ref,
+  int the_attribute: @attribute ref
+)
+
+param_block_parameter(
+  int id: @param_block ref,
+  int index: int ref,
+  int the_parameter: @parameter ref
+)
+
+param_block_location(
+  int id: @param_block ref,
+  int id: @location ref
+)
+
+// ParameterAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.parameterast?view=powershellsdk-7.3.0
+parameter(
+  unique int id: @parameter,
+  int name: @variable_expression ref,
+  string staticType: string ref,
+  int numAttributes: int ref
+)
+
+parameter_attribute(
+  int id: @parameter ref,
+  int index: int ref,
+  int the_attribute: @attribute_base ref
+)
+
+parameter_location(
+  int id: @parameter ref,
+  int loc: @location ref
+)
+
+parameter_default_value(
+  int id: @parameter ref,
+  int default_value: @expression ref
+)
+
+// TypeConstraintAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.typeconstraintast?view=powershellsdk-7.3.0
+type_constraint(
+  unique int id: @type_constraint,
+  string name: string ref,
+  string fullName: string ref
+)
+
+type_constraint_location(
+  int id: @type_constraint ref,
+  int loc: @location ref
+)
+
+// FunctionDefinitionAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.functiondefinitionast?view=powershellsdk-7.3.0
+function_definition(
+  unique int id: @function_definition,
+  int body: @script_block ref,
+  string name: string ref,
+  boolean isFilter: boolean ref,
+  boolean isWorkflow: boolean ref
+)
+
+function_definition_parameter(
+  int id: @function_definition ref,
+  int index: int ref,
+  int parameter: @parameter ref
+)
+
+function_definition_location(
+  int id: @function_definition ref,
+  int loc: @location ref
+)
+
+// BreakStatementAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.breakstatementast?view=powershellsdk-7.3.0
+break_statement(
+  unique int id: @break_statement
+)
+
+break_statement_location(
+  int id: @break_statement ref,
+  int loc: @location ref
+)
+
+// ContinueStatementAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.continuestatementast?view=powershellsdk-7.3.0
+continue_statement(
+  unique int id: @continue_statement
+)
+
+continue_statement_location(
+  int id: @continue_statement ref,
+  int loc: @location ref
+)
+@labelled_statement = @continue_statement | @break_statement;
+
+statement_label(
+  int id: @labelled_statement ref,
+  int label: @expression ref
+)
+
+// ReturnStatementAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.returnstatementast?view=powershellsdk-7.3.0
+return_statement(
+  unique int id: @return_statement
+)
+
+return_statement_pipeline(
+  int id: @return_statement ref,
+  int pipeline: @pipeline_base ref
+)
+
+return_statement_location(
+  int id: @return_statement ref,
+  int loc: @location ref
+)
+
+// DoWhileStatementAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.dowhilestatementast?view=powershellsdk-7.3.0
+do_while_statement(
+  unique int id: @do_while_statement,
+  int body: @statement_block ref
+)
+
+do_while_statement_condition(
+  int id: @do_while_statement ref,
+  int condition: @pipeline_base ref
+)
+
+do_while_statement_location(
+  int id: @do_while_statement ref,
+  int loc: @location ref
+)
+
+// DoUntilStatementAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.dountilstatementast?view=powershellsdk-7.3.0
+do_until_statement(
+  unique int id: @do_until_statement,
+  int body: @statement_block ref
+)
+
+do_until_statement_condition(
+  int id: @do_until_statement ref,
+  int condition: @pipeline_base ref
+)
+
+do_until_statement_location(
+  int id: @do_until_statement ref,
+  int loc: @location ref
+)
+
+// WhileStatementAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.whilestatementast?view=powershellsdk-7.3.0
+while_statement(
+  unique int id: @while_statement,
+  int body: @statement_block ref
+)
+
+while_statement_condition(
+  int id: @while_statement ref,
+  int condition: @pipeline_base ref
+)
+
+while_statement_location(
+  int id: @while_statement ref,
+  int loc: @location ref
+)
+
+// ForEachStatementAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.foreachstatementast?view=powershellsdk-7.3.0
+foreach_statement(
+  unique int id: @foreach_statement,
+  int variable: @variable_expression ref,
+  int condition: @pipeline_base ref,
+  int body: @statement_block ref,
+  int flags: int ref
+)
+
+foreach_statement_location(
+  int id: @foreach_statement ref,
+  int loc: @location ref
+)
+
+// ForStatementAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.forstatementast?view=powershellsdk-7.3.0
+for_statement(
+  unique int id: @for_statement,
+  int body: @statement_block ref
+)
+
+for_statement_location(
+  int id: @for_statement ref,
+  int loc: @location ref
+)
+
+for_statement_condition(
+  int id: @for_statement ref,
+  int condition: @pipeline_base ref
+)
+
+for_statement_initializer(
+  int id: @for_statement ref,
+  int initializer: @pipeline_base ref
+)
+
+for_statement_iterator(
+  int id: @for_statement ref,
+  int iterator: @pipeline_base ref
+)
+
+// ExpandableStringExpressionAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.expandablestringexpressionast?view=powershellsdk-7.3.0
+expandable_string_expression(
+  unique int id: @expandable_string_expression,
+  int value: @string_literal ref,
+  int kind: int ref,
+  int numExpression: int ref
+)
+
+case @expandable_string_expression.kind of
+ 4 = @BareWord
+| 2 = @DoubleQuoted
+| 3 = @DoubleQuotedHereString
+| 0 = @SingleQuoted
+| 1 = @SingleQuotedHereString;
+
+expandable_string_expression_location(
+  int id: @expandable_string_expression ref,
+  int loc: @location ref
+)
+
+expandable_string_expression_nested_expression(
+  int id: @expandable_string_expression ref,
+  int index: int ref,
+  int nestedExression: @expression ref
+)
+
+// StringLiterals
+// Contains string literals broken into lines to prevent breaks in the trap from multiline strings
+string_literal(
+  unique int id: @string_literal
+)
+
+string_literal_location(
+  int id: @string_literal ref,
+  int loc: @location ref
+)
+
+string_literal_line(
+  int id: @string_literal ref,
+  int lineNum: int ref,
+  string line: string ref
+)
+
+// UnaryExpressionAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.unaryexpressionast?view=powershellsdk-7.3.0
+unary_expression(
+  unique int id: @unary_expression,
+  int child: @ast ref,
+  int kind: int ref,
+  string staticType: string ref
+)
+
+unary_expression_location(
+  int id: @unary_expression ref,
+  int loc: @location ref
+)
+
+// CatchClauseAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.catchclauseast?view=powershellsdk-7.3.0
+catch_clause(
+  unique int id: @catch_clause,
+  int body: @statement_block ref,
+  boolean isCatchAll: boolean ref
+)
+
+catch_clause_catch_type(
+  int id: @catch_clause ref,
+  int index: int ref,
+  int catch_type: @type_constraint ref
+)
+
+catch_clause_location(
+  int id: @catch_clause ref,
+  int loc: @location ref
+)
+
+// ThrowStatementAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.throwstatementast?view=powershellsdk-7.3.0
+throw_statement(
+  unique int id: @throw_statement,
+  boolean isRethrow: boolean ref
+)
+
+throw_statement_location(
+  int id: @throw_statement ref,
+  int loc: @location ref
+)
+
+throw_statement_pipeline(
+  int id: @throw_statement ref,
+  int pipeline: @ast ref
+)
+
+// TryStatementAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.trystatementast?view=powershellsdk-7.3.0
+try_statement(
+  unique int id: @try_statement,
+  int body: @statement_block ref
+)
+
+try_statement_catch_clause(
+  int id: @try_statement ref,
+  int index: int ref,
+  int catch_clause: @catch_clause ref
+)
+
+
+try_statement_finally(
+  int id: @try_statement ref,
+  int finally: @ast ref
+)
+
+try_statement_location(
+  int id: @try_statement ref,
+  int loc: @location ref
+)
+
+// FileRedirectionAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.fileredirectionast?view=powershellsdk-7.3.0
+file_redirection(
+  unique int id: @file_redirection,
+  int location: @ast ref,
+  boolean isAppend: boolean ref,
+  int redirectionType: int ref
+)
+
+case @file_redirection.redirectionType of
+ 0 = @All
+| 1 = @Output
+| 2 = @Error
+| 3 = @Warning
+| 4 = @Verbose
+| 5 = @Debug
+| 6 = @Information;
+
+file_redirection_location(
+  int id: @file_redirection ref,
+  int loc: @location ref
+)
+
+// BlockStatementAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.blockstatementast?view=powershellsdk-7.3.0
+block_statement(
+  unique int id: @block_statement,
+  int body: @ast ref,
+  int token: @token ref
+)
+
+block_statement_location(
+  int id: @block_statement ref,
+  int loc: @location ref
+)
+
+// Token
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.token?view=powershellsdk-7.3.0
+token(
+  unique int id: @token,
+  boolean hasError: boolean ref,
+  int kind: int ref,
+  string text: string ref,
+  int tokenFlags: int ref
+)
+
+token_location(
+  int id: @token ref,
+  int loc: @location ref
+)
+
+// ConfigurationDefinitionAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.configurationdefinitionast?view=powershellsdk-7.3.0
+configuration_definition(
+  unique int id: @configuration_definition,
+  int body: @script_block_expression ref,
+  int configurationType: int ref,
+  int name: @expression ref
+)
+
+configuration_definition_location(
+  int id: @configuration_definition ref,
+  int loc: @location ref
+)
+
+// DataStatementAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.datastatementast?view=powershellsdk-7.3.0
+data_statement(
+  unique int id: @data_statement,
+  int body: @statement_block ref
+)
+
+data_statement_variable(
+  int id: @data_statement ref,
+  string variable: string ref
+)
+
+data_statement_commands_allowed(
+  int id: @data_statement ref,
+  int index: int ref,
+  int command_allowed: @ast ref
+)
+
+data_statement_location(
+  int id: @data_statement ref,
+  int loc: @location ref
+)
+
+// DynamicKeywordStatementAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.dynamickeywordstatementast?view=powershellsdk-7.3.0
+dynamic_keyword_statement(
+  unique int id: @dynamic_keyword_statement
+)
+
+dynamic_keyword_statement_command_elements(
+  int id: @dynamic_keyword_statement ref,
+  int index: int ref,
+  int element: @command_element ref
+)
+
+dynamic_keyword_statement_location(
+  int id: @dynamic_keyword_statement ref,
+  int loc: @location ref
+)
+
+// ErrorExpressionAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.errorexpressionast?view=powershellsdk-7.3.0
+error_expression(
+  unique int id: @error_expression
+)
+
+error_expression_nested_ast(
+  int id: @error_expression ref,
+  int index: int ref,
+  int nested_ast: @ast ref
+)
+
+error_expression_location(
+  int id: @error_expression ref,
+  int loc: @location ref
+)
+
+// ErrorStatementAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.errorstatementast?view=powershellsdk-7.3.0
+error_statement(
+  unique int id: @error_statement,
+  int token: @token ref
+)
+
+error_statement_location(
+  int id: @error_statement ref,
+  int loc: @location ref
+)
+
+error_statement_nested_ast(
+  int id: @error_statement ref,
+  int index: int ref,
+  int nested_ast: @ast ref
+)
+
+error_statement_conditions(
+  int id: @error_statement ref,
+  int index: int ref,
+  int condition: @ast ref
+)
+
+error_statement_bodies(
+  int id: @error_statement ref,
+  int index: int ref,
+  int body: @ast ref
+)
+
+error_statement_flag(
+  int id: @error_statement ref,
+  int index: int ref,
+  int k: string ref, // The key
+  int token: @token ref, // These two form a tuple of the value
+  int ast: @ast ref
+)
+
+// FunctionMemberAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.functionmemberast?view=powershellsdk-7.3.0
+function_member(
+  unique int id: @function_member,
+  int body: @ast ref,
+  boolean isConstructor: boolean ref,
+  boolean isHidden: boolean ref,
+  boolean isPrivate: boolean ref,
+  boolean isPublic: boolean ref,
+  boolean isStatic: boolean ref,
+  string name: string ref,
+  int methodAttributes: int ref
+)
+
+function_member_location(
+  int id: @function_member ref,
+  int loc: @location ref
+)
+
+function_member_parameter(
+  int id: @function_member ref,
+  int index: int ref,
+  int parameter: @ast ref
+)
+
+function_member_attribute(
+  int id: @function_member ref,
+  int index: int ref,
+  int attribute: @ast ref
+)
+
+function_member_return_type(
+  int id: @function_member ref,
+  int return_type: @type_constraint ref
+)
+
+// MergingRedirectionAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.mergingredirectionast?view=powershellsdk-7.3.0
+merging_redirection(
+  unique int id: @merging_redirection,
+  int from: int ref,
+  int to: int ref
+)
+
+merging_redirection_location(
+  int id: @merging_redirection ref,
+  int loc: @location ref
+)
+
+
+label(
+  int id: @labeled_statement ref,
+  string label: string ref
+)
+
+// TrapStatementAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.trapstatementast?view=powershellsdk-7.3.0
+trap_statement(
+  unique int id: @trap_statement,
+  int body: @ast ref
+)
+
+trap_statement_type(
+  int id: @trap_statement ref,
+  int trap_type: @type_constraint ref
+)
+
+trap_statement_location(
+  int id: @trap_statement ref,
+  int loc: @location ref
+)
+
+// PipelineChainAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.pipelinechainast?view=powershellsdk-7.3.0
+pipeline_chain(
+  unique int id: @pipeline_chain,
+  boolean isBackground: boolean ref,
+  int kind: int ref,
+  int left: @ast ref,
+  int right: @ast ref
+)
+
+pipeline_chain_location(
+  int id: @pipeline_chain ref,
+  int loc: @location ref
+)
+
+// PropertyMemberAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.propertymemberast?view=powershellsdk-7.3.0
+property_member(
+  unique int id: @property_member,
+  boolean isHidden: boolean ref,
+  boolean isPrivate: boolean ref,
+  boolean isPublic: boolean ref,
+  boolean isStatic: boolean ref,
+  string name: string ref,
+  int methodAttributes: int ref
+)
+
+property_member_attribute(
+  int id: @property_member ref,
+  int index: int ref,
+  int attribute: @ast ref
+)
+
+property_member_property_type(
+  int id: @property_member ref,
+  int property_type: @type_constraint ref
+)
+
+property_member_initial_value(
+  int id: @property_member ref,
+  int initial_value: @ast ref
+)
+
+property_member_location(
+  int id: @property_member ref,
+  int loc: @location ref
+)
+
+// ScriptBlockExpressionAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.scriptblockexpressionast?view=powershellsdk-7.3.0
+script_block_expression(
+  unique int id: @script_block_expression,
+  int body: @script_block ref
+)
+
+script_block_expression_location(
+  int id: @script_block_expression ref,
+  int loc: @location ref
+)
+
+// SwitchStatementAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.switchstatementast?view=powershellsdk-7.3.0
+switch_statement(
+  unique int id: @switch_statement,
+  int condition: @ast ref,
+  int flags: int ref
+)
+
+switch_statement_clauses(
+  int id: @switch_statement ref,
+  int index: int ref,
+  int expression: @ast ref,
+  int statementBlock: @ast ref
+)
+
+switch_statement_location(
+  int id: @switch_statement ref,
+  int loc: @location ref
+)
+
+switch_statement_default(
+  int id: @switch_statement ref,
+  int default: @ast ref
+)
+
+// TypeDefinitionAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.typedefinitionast?view=powershellsdk-7.3.0
+type_definition(
+  unique int id: @type_definition,
+  string name: string ref,
+  int flags: int ref,
+  boolean isClass: boolean ref,
+  boolean isEnum: boolean ref,
+  boolean isInterface: boolean ref
+)
+
+type_definition_attributes(
+  int id: @type_definition ref,
+  int index: int ref,
+  int attribute: @ast ref
+)
+
+type_definition_members(
+  int id: @type_definition ref,
+  int index: int ref,
+  int member: @ast ref
+)
+
+type_definition_location(
+  int id: @type_definition ref,
+  int loc: @location ref
+)
+
+type_definition_base_type(
+  int id: @type_definition ref,
+  int index: int ref,
+  int base_type: @type_constraint ref
+)
+
+// UsingExpressionAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.usingexpressionast?view=powershellsdk-7.3.0
+using_expression(
+  unique int id: @using_expression,
+  int subExpression: @ast ref
+)
+
+using_expression_location(
+  int id: @using_expression ref,
+  int loc: @location ref
+)
+
+// UsingStatementAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.usingstatementast?view=powershellsdk-7.3.0
+using_statement(
+  unique int id: @using_statement,
+  int kind: int ref
+)
+
+using_statement_location(
+  int id: @using_statement ref,
+  int loc: @location ref
+)
+
+using_statement_alias(
+  int id: @using_statement ref,
+  int alias: @ast ref
+)
+
+using_statement_module_specification(
+  int id: @using_statement ref,
+  int module_specification: @ast ref
+)
+
+using_statement_name(
+  int id: @using_statement ref,
+  int name: @ast ref
+)
+
+// HashTableAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.hashtableast?view=powershellsdk-7.3.0
+hash_table(
+  unique int id: @hash_table
+)
+
+hash_table_location(
+  int id: @hash_table ref,
+  int loc: @location ref
+)
+
+hash_table_key_value_pairs(
+  int id: @hash_table ref,
+  int index: int ref,
+  int k: @ast ref,
+  int v: @ast ref
+)
+
+// AttributedExpressionAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.attributedexpressionast?view=powershellsdk-7.3.0
+attributed_expression(
+  unique int id: @attributed_expression,
+  int attribute: @ast ref,
+  int expression: @ast ref
+)
+
+attributed_expression_location(
+  int id: @attributed_expression ref,
+  int loc: @location ref
+)
+
+// TokenKind
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.tokenkind?view=powershellsdk-7.3.0
+token_kind_reference(
+  unique int id: @token_kind_reference,
+  string name: string ref,
+  int kind: int ref
+)
+
+@token_kind = @ampersand | @and | @andAnd | @as | @assembly | @atCurly | @atParen | @band | @base | @begin | @bnot | @bor | @break 
+| @bxor | @catch | @ccontains | @ceq | @cge | @cgt | @cin | @class | @cle | @clean | @clike | @clt | @cmatch | @cne | @cnotcontains 
+| @cnotin | @cnotlike | @cnotmatch | @colon | @colonColon | @comma | @command_token | @comment | @configuration | @continue | @creplace 
+| @csplit | @data | @default | @define | @divide | @divideEquals | @do | @dollarParen | @dot | @dotDot | @dynamicKeyword | @dynamicparam 
+| @else | @elseIf | @end | @endOfInput | @enum | @equals | @exclaim | @exit | @filter | @finally | @for | @foreach | @format | @from 
+| @function | @generic | @hereStringExpandable | @hereStringLiteral | @hidden | @icontains | @identifier | @ieq | @if | @ige | @igt 
+| @iin | @ile | @ilike | @ilt | @imatch | @in | @ine | @inlineScript | @inotcontains | @inotin | @inotlike | @inotmatch | @interface 
+| @ireplace | @is | @isNot | @isplit | @join | @label | @lBracket | @lCurly | @lineContinuation | @lParen | @minus | @minusEquals 
+| @minusMinus | @module | @multiply | @multiplyEquals | @namespace | @newLine | @not | @number | @or | @orOr | @parallel | @param 
+| @parameter_token | @pipe | @plus | @plusEquals | @plusPlus | @postfixMinusMinus | @postfixPlusPlus | @private | @process | @public 
+| @questionDot | @questionLBracket | @questionMark | @questionQuestion | @questionQuestionEquals | @rBracket | @rCurly | @redirectInStd 
+| @redirection_token | @rem | @remainderEquals | @return | @rParen | @semi | @sequence | @shl | @shr | @splattedVariable | @static 
+| @stringExpandable | @stringLiteral_token | @switch | @throw | @trap | @try | @type | @unknown | @until | @using | @var | @variable 
+| @while | @workflow | @xor;
+
+case @token_kind_reference.kind of
+28 = @ampersand // The invocation operator '&'.
+| 53 = @and // The logical and operator '-and'.
+| 26 = @andAnd // The (unimplemented) operator '&&'.
+| 94 = @as // The type conversion operator '-as'.
+| 165 = @assembly // The 'assembly' keyword
+| 23 = @atCurly // The opening token of a hash expression '@{'.
+| 22 = @atParen // The opening token of an array expression '@('.
+| 56 = @band // The bitwise and operator '-band'.
+| 168 = @base // The 'base' keyword
+| 119 = @begin // The 'begin' keyword.
+| 52 = @bnot // The bitwise not operator '-bnot'.
+| 57 = @bor // The bitwise or operator '-bor'.
+| 120 = @break // The 'break' keyword.
+| 58 = @bxor // The bitwise exclusive or operator '-xor'.
+| 121 = @catch // The 'catch' keyword.
+| 87 = @ccontains // The case sensitive contains operator '-ccontains'.
+| 76 = @ceq // The case sensitive equal operator '-ceq'.
+| 78 = @cge // The case sensitive greater than or equal operator '-cge'.
+| 79 = @cgt // The case sensitive greater than operator '-cgt'.
+| 89 = @cin // The case sensitive in operator '-cin'.
+| 122 = @class // The 'class' keyword.
+| 81 = @cle // The case sensitive less than or equal operator '-cle'.
+| 170 = @clean // The 'clean' keyword.
+| 82 = @clike // The case sensitive like operator '-clike'.
+| 80 = @clt // The case sensitive less than operator '-clt'.
+| 84 = @cmatch // The case sensitive match operator '-cmatch'.
+| 77 = @cne // The case sensitive not equal operator '-cne'.
+| 88 = @cnotcontains // The case sensitive not contains operator '-cnotcontains'.
+| 90 = @cnotin // The case sensitive not in operator '-notin'.
+| 83 = @cnotlike // The case sensitive notlike operator '-cnotlike'.
+| 85 = @cnotmatch // The case sensitive not match operator '-cnotmatch'.
+| 99 = @colon // The PS class base class and implemented interfaces operator ':'. Also used in base class ctor calls.
+| 34 = @colonColon // The static member access operator '::'.
+| 30 = @comma // The unary or binary array operator ','.
+| 166 = @command_token // The 'command' keyword
+| 10 = @comment // A single line comment, or a delimited comment.
+| 155 = @configuration // The "configuration" keyword
+| 123 = @continue // The 'continue' keyword.
+| 86 = @creplace // The case sensitive replace operator '-creplace'.
+| 91 = @csplit // The case sensitive split operator '-csplit'.
+| 124 = @data // The 'data' keyword.
+| 169 = @default // The 'default' keyword
+| 125 = @define // The (unimplemented) 'define' keyword.
+| 38 = @divide // The division operator '/'.
+| 46 = @divideEquals // The division assignment operator '/='.
+| 126 = @do // The 'do' keyword.
+| 24 = @dollarParen // The opening token of a sub-expression '$('.
+| 35 = @dot // The instance member access or dot source invocation operator '.'.
+| 33 = @dotDot // The range operator '..'.
+| 156 = @dynamicKeyword // The token kind for dynamic keywords
+| 127 = @dynamicparam // The 'dynamicparam' keyword.
+| 128 = @else // The 'else' keyword.
+| 129 = @elseIf // The 'elseif' keyword.
+| 130 = @end // The 'end' keyword.
+| 11 = @endOfInput // Marks the end of the input script or file.
+| 161 = @enum // The 'enum' keyword
+| 42 = @equals // The assignment operator '='.
+| 36 = @exclaim // The logical not operator '!'.
+| 131 = @exit // The 'exit' keyword.
+| 132 = @filter // The 'filter' keyword.
+| 133 = @finally // The 'finally' keyword.
+| 134 = @for // The 'for' keyword.
+| 135 = @foreach // The 'foreach' keyword.
+| 50 = @format // The string format operator '-f'.
+| 136 = @from // The (unimplemented) 'from' keyword.
+| 137 = @function // The 'function' keyword.
+| 7 = @generic // A token that is only valid as a command name, command argument, function name, or configuration name. It may contain characters not allowed in identifiers. Tokens with this kind are always instances of StringLiteralToken or StringExpandableToken if the token contains variable references or subexpressions.
+| 15 = @hereStringExpandable // A double quoted here string literal. Tokens with this kind are always instances of StringExpandableToken. even if there are no nested tokens to expand.
+| 14 = @hereStringLiteral // A single quoted here string literal. Tokens with this kind are always instances of StringLiteralToken.
+| 167 = @hidden // The 'hidden' keyword
+| 71 = @icontains // The case insensitive contains operator '-icontains' or '-contains'.
+| 6 = @identifier // A simple identifier, always begins with a letter or '', and is followed by letters, numbers, or ''.
+| 60 = @ieq // The case insensitive equal operator '-ieq' or '-eq'.
+| 138 = @if // The 'if' keyword.
+| 62 = @ige // The case insensitive greater than or equal operator '-ige' or '-ge'.
+| 63 = @igt // The case insensitive greater than operator '-igt' or '-gt'.
+| 73 = @iin // The case insensitive in operator '-iin' or '-in'.
+| 65 = @ile // The case insensitive less than or equal operator '-ile' or '-le'.
+| 66 = @ilike // The case insensitive like operator '-ilike' or '-like'.
+| 64 = @ilt // The case insensitive less than operator '-ilt' or '-lt'.
+| 68 = @imatch // The case insensitive match operator '-imatch' or '-match'.
+| 139 = @in // The 'in' keyword.
+| 61 = @ine // The case insensitive not equal operator '-ine' or '-ne'.
+| 154 = @inlineScript // The 'InlineScript' keyword
+| 72 = @inotcontains // The case insensitive notcontains operator '-inotcontains' or '-notcontains'.
+| 74 = @inotin // The case insensitive notin operator '-inotin' or '-notin'
+| 67 = @inotlike // The case insensitive not like operator '-inotlike' or '-notlike'.
+| 69 = @inotmatch // The case insensitive not match operator '-inotmatch' or '-notmatch'.
+| 160 = @interface // The 'interface' keyword
+| 70 = @ireplace // The case insensitive replace operator '-ireplace' or '-replace'.
+| 92 = @is // The type test operator '-is'.
+| 93 = @isNot // The type test operator '-isnot'.
+| 75 = @isplit // The case insensitive split operator '-isplit' or '-split'.
+| 59 = @join // The join operator '-join'.
+| 5 = @label // A label token - always begins with ':', followed by the label name. Tokens with this kind are always instances of LabelToken.
+| 20 = @lBracket // The opening square brace token '['.
+| 18 = @lCurly // The opening curly brace token '{'.
+| 9 = @lineContinuation // A line continuation (backtick followed by newline).
+| 16 = @lParen // The opening parenthesis token '('.
+| 41 = @minus // The substraction operator '-'.
+| 44 = @minusEquals // The subtraction assignment operator '-='.
+| 31 = @minusMinus // The pre-decrement operator '--'.
+| 163 = @module // The 'module' keyword
+| 37 = @multiply // The multiplication operator '*'.
+| 45 = @multiplyEquals // The multiplication assignment operator '*='.
+| 162 = @namespace // The 'namespace' keyword
+| 8 = @newLine // A newline (one of '\n', '\r', or '\r\n').
+| 51 = @not // The logical not operator '-not'.
+| 4 = @number // Any numerical literal token. Tokens with this kind are always instances of NumberToken.
+| 54 = @or // The logical or operator '-or'.
+| 27 = @orOr // The (unimplemented) operator '||'.
+| 152 = @parallel // The 'parallel' keyword.
+| 140 = @param // The 'param' keyword.
+| 3 = @parameter_token // A parameter to a command, always begins with a dash ('-'), followed by the parameter name. Tokens with this kind are always instances of ParameterToken.
+| 29 = @pipe // The pipe operator '|'.
+| 40 = @plus // The addition operator '+'.
+| 43 = @plusEquals // The addition assignment operator '+='.
+| 32 = @plusPlus // The pre-increment operator '++'.
+| 96 = @postfixMinusMinus // The post-decrement operator '--'.
+| 95 = @postfixPlusPlus // The post-increment operator '++'.
+| 158 = @private // The 'private' keyword
+| 141 = @process // The 'process' keyword.
+| 157 = @public // The 'public' keyword
+| 103 = @questionDot // The null conditional member access operator '?.'.
+| 104 = @questionLBracket // The null conditional index access operator '?[]'.
+| 100 = @questionMark // The ternary operator '?'.
+| 102 = @questionQuestion // The null coalesce operator '??'.
+| 101 = @questionQuestionEquals // The null conditional assignment operator '??='.
+| 21 = @rBracket // The closing square brace token ']'.
+| 19 = @rCurly // The closing curly brace token '}'.
+| 49 = @redirectInStd // The (unimplemented) stdin redirection operator '<'.
+| 48 = @redirection_token // A redirection operator such as '2>&1' or '>>'.
+| 39 = @rem // The modulo division (remainder) operator '%'.
+| 47 = @remainderEquals // The modulo division (remainder) assignment operator '%='.
+| 142 = @return // The 'return' keyword.
+| 17 = @rParen // The closing parenthesis token ')'.
+| 25 = @semi // The statement terminator ';'.
+| 153 = @sequence // The 'sequence' keyword.
+| 97 = @shl // The shift left operator.
+| 98 = @shr // The shift right operator.
+| 2 = @splattedVariable // A splatted variable token, always begins with '@' and followed by the variable name. Tokens with this kind are always instances of VariableToken.
+| 159 = @static // The 'static' keyword
+| 13 = @stringExpandable // A double quoted string literal. Tokens with this kind are always instances of StringExpandableToken even if there are no nested tokens to expand.
+| 12 = @stringLiteral_token // A single quoted string literal. Tokens with this kind are always instances of StringLiteralToken.
+| 143 = @switch // The 'switch' keyword.
+| 144 = @throw // The 'throw' keyword.
+| 145 = @trap // The 'trap' keyword.
+| 146 = @try // The 'try' keyword.
+| 164 = @type // The 'type' keyword
+| 0 = @unknown // An unknown token, signifies an error condition.
+| 147 = @until // The 'until' keyword.
+| 148 = @using // The (unimplemented) 'using' keyword.
+| 149 = @var // The (unimplemented) 'var' keyword.
+| 1 = @variable // A variable token, always begins with '$' and followed by the variable name, possibly enclose in curly braces. Tokens with this kind are always instances of VariableToken.
+| 150 = @while // The 'while' keyword.
+| 151 = @workflow // The 'workflow' keyword.
+| 55 = @xor; // The logical exclusive or operator '-xor'.
\ No newline at end of file
diff --git a/powershell/downgrades/c5191f89a6e3e8cea428b5c7326a06e335738533/semmlecode.powershell.dbscheme b/powershell/downgrades/c5191f89a6e3e8cea428b5c7326a06e335738533/semmlecode.powershell.dbscheme
new file mode 100644
index 00000000000..802d5b9f407
--- /dev/null
+++ b/powershell/downgrades/c5191f89a6e3e8cea428b5c7326a06e335738533/semmlecode.powershell.dbscheme
@@ -0,0 +1,1648 @@
+/* Mandatory */
+sourceLocationPrefix(
+  varchar(900) prefix: string ref
+);
+
+/* Entity Locations */
+@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
+);
+
+/* File Metadata */
+
+numlines(
+  unique int element_id: @file ref,
+  int num_lines: int ref,
+  int num_code: int ref,
+  int num_comment: int ref
+);
+
+files(
+  unique int id: @file,
+  varchar(900) name: string ref
+);
+
+folders(
+  unique int id: @folder,
+  varchar(900) name: string ref
+);
+
+@container = @folder | @file;
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref
+);
+
+/* Comments */
+comment_entity(
+  unique int id: @comment_entity,
+  int text: @string_literal ref
+);
+
+comment_entity_location(
+  unique int id: @comment_entity ref,
+  int loc: @location ref
+);
+
+/* Messages */
+extractor_messages(
+  unique int id: @extractor_message,
+  int severity: int ref,
+  string origin : string ref,
+  string text : string ref,
+  string entity : string ref,
+  int location: @location_default ref,
+  string stack_trace : string ref
+);
+
+parent(
+  int child: @ast ref,
+  int parent: @ast ref
+);
+
+/* AST Nodes */
+// This is all the kinds of nodes that can inherit from Ast
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.ast?view=powershellsdk-7.3.0
+@ast = @not_implemented | @attribute_base | @catch_clause | @command_element |
+@member | @named_block | @param_block | @parameter | @redirection | @script_block | @statement | @statement_block | @named_attribute_argument;
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.attributebaseast?view=powershellsdk-7.2.0
+@attribute_base = @attribute | @type_constraint;
+
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.memberast?view=powershellsdk-7.3.0
+@member = @function_member | @property_member;
+
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.commandbaseast?view=powershellsdk-7.3.0
+@command_base = @command | @command_expression;
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.chainableast?view=powershellsdk-7.3.0
+@chainable = @command_base | @pipeline | @pipeline_chain;
+//https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.pipelinebaseast?view=powershellsdk-7.3.0
+@pipeline_base = @chainable | @error_statement | @assignment_statement;
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.statementast?view=powershellsdk-7.3.0
+@statement = @block_statement 
+| @break_statement 
+| @command_base
+| @configuration_definition 
+| @continue_statement 
+| @data_statement 
+| @dynamic_keyword_statement 
+| @exit_statement 
+| @function_definition 
+| @if_statement 
+| @labeled_statement 
+| @pipeline_base
+| @return_statement 
+| @throw_statement 
+| @trap_statement 
+| @try_statement 
+| @type_definition
+| @using_statement;
+
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.loopstatementast?view=powershellsdk-7.3.0
+@loop_statement = @do_until_statement | @do_while_statement | @foreach_statement | @for_statement | @while_statement;
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.labeledstatementast?view=powershellsdk-7.3.0
+@labeled_statement = @loop_statement | @switch_statement;
+
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.attributedexpressionast?view=powershellsdk-7.3.0
+@attributed_expression_ast = @attributed_expression | @convert_expression;
+
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.memberexpressionast?view=powershellsdk-7.3.0
+@member_expression_base = @member_expression | @invoke_member_expression; // | @base_ctor_invoke_member_expression
+
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.expressionast?view=powershellsdk-7.3.0
+@expression = @array_expression
+| @array_literal
+| @attributed_expression_ast
+| @binary_expression
+| @error_expression
+| @expandable_string_expression
+| @hash_table
+| @index_expression
+| @member_expression_base
+| @paren_expression
+| @script_block_expression
+| @sub_expression
+| @ternary_expression
+| @type_expression
+| @unary_expression
+| @using_expression
+| @variable_expression
+| @base_constant_expression;
+
+// Constant expression can both be instanced and extended by string constant expression
+@base_constant_expression = @constant_expression | @string_constant_expression;
+
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.commandelementast?view=powershellsdk-7.3.0
+@command_element = @expression | @command_parameter;
+
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.redirectionast?view=powershellsdk-7.3.0
+@redirection = @file_redirection | @merging_redirection;
+
+/** 
+Entries in this table indicate visited C# powershell ast objects which don't have parsing implemented yet.  
+
+You can obtain the Type of the C# AST objects which don't yet have an associated entity to parse them
+ using this QL query on an extracted db:
+
+from string s
+where not_implemented(_, s)
+select s
+*/
+not_implemented(
+  unique int id: @not_implemented,
+  string name: string ref
+);
+
+not_implemented_location(
+  int id: @not_implemented ref,
+  int loc: @location ref
+);
+
+// ArrayExpressionAst 
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.arrayexpressionast?view=powershellsdk-7.3.0
+array_expression(
+  unique int id: @array_expression,
+  int subExpression: @statement_block ref
+)
+
+array_expression_location(
+  int id: @array_expression ref,
+  int loc: @location ref
+)
+
+// ArrayLiteralAst 
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.arrayliteralast?view=powershellsdk-7.3.0
+array_literal(
+  unique int id: @array_literal
+)
+
+array_literal_location(
+  int id: @array_literal ref,
+  int loc: @location ref
+)
+
+array_literal_element(
+  int id: @array_literal ref,
+  int index: int ref,
+  int component: @expression ref
+)
+
+// AssignmentStatementAst 
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.assignmentstatementast?view=powershellsdk-7.3.0
+// https://github.com/PowerShell/PowerShell/blob/48c9d683565ed9402430a27e09410d56d52d4bfd/src/System.Management.Automation/engine/parser/Compiler.cs#L983-L989
+assignment_statement(
+  unique int id: @assignment_statement,
+  int kind: int ref, // @token_kind ref
+  int left: @expression ref,
+  int right: @statement ref
+)
+
+assignment_statement_location(
+  int id: @assignment_statement ref,
+  int loc: @location ref
+)
+
+// NamedBlockAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.namedblockast?view=powershellsdk-7.3.0
+named_block(
+  unique int id: @named_block,
+  int numStatements: int ref,
+  int numTraps: int ref
+)
+
+named_block_statement(
+  int id: @named_block ref,
+  int index: int ref,
+  int statement: @statement ref
+)
+
+named_block_trap(
+  int id: @named_block ref,
+  int index: int ref,
+  int trap: @trap_statement ref
+)
+
+named_block_location(
+  int id: @named_block ref,
+  int loc: @location ref
+)
+
+// ScriptBlockAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.scriptblockast?view=powershellsdk-7.3.0
+script_block(
+  unique int id: @script_block,
+  int numUsings: int ref,
+  int numRequiredModules: int ref,
+  int numRequiredAssemblies: int ref,
+  int numRequiredPsEditions: int ref,
+  int numRequiredPsSnapins: int ref
+)
+
+script_block_param_block(
+  int id: @script_block ref,
+  int the_param_block: @param_block ref
+)
+
+script_block_begin_block(
+  int id: @script_block ref,
+  int begin_block: @named_block ref
+)
+
+script_block_clean_block(
+  int id: @script_block ref,
+  int clean_block: @named_block ref
+)
+
+script_block_dynamic_param_block(
+  int id: @script_block ref,
+  int dynamic_param_block: @named_block ref
+)
+
+script_block_end_block(
+  int id: @script_block ref,
+  int end_block: @named_block ref
+)
+
+script_block_process_block(
+  int id: @script_block ref,
+  int process_block: @named_block ref
+)
+
+script_block_using(
+  int id: @script_block ref,
+  int index: int ref,
+  int using: @ast ref
+)
+
+script_block_required_application_id(
+  int id: @script_block ref,
+  string application_id: string ref
+)
+
+script_block_requires_elevation(
+  int id: @script_block ref,
+  boolean requires_elevation: boolean ref
+)
+
+script_block_required_ps_version(
+  int id: @script_block ref,
+  string required_ps_version: string ref
+)
+
+script_block_required_module(
+  int id: @script_block ref,
+  int index: int ref,
+  int required_module: @module_specification ref
+)
+
+script_block_required_assembly(
+  int id: @script_block ref,
+  int index: int ref,
+  string required_assembly: string ref
+)
+
+script_block_required_ps_edition(
+  int id: @script_block ref,
+  int index: int ref,
+  string required_ps_edition: string ref
+)
+
+script_block_requires_ps_snapin(
+  int id: @script_block ref,
+  int index: int ref,
+  string name: string ref,
+  string version: string ref
+)
+
+script_block_location(
+  int id: @script_block ref,
+  int loc: @location ref
+)
+
+// ModuleSpecification
+// https://learn.microsoft.com/en-us/dotnet/api/microsoft.powershell.commands.modulespecification?view=powershellsdk-7.3.0
+module_specification(
+  unique int id: @module_specification,
+  string name: string ref,
+  string guid: string ref,
+  string maxVersion: string ref,
+  string requiredVersion: string ref,
+  string version: string ref
+)
+
+// BinaryExpressionAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.binaryexpressionast?view=powershellsdk-7.3.0
+// https://github.com/PowerShell/PowerShell/blob/48c9d683565ed9402430a27e09410d56d52d4bfd/src/System.Management.Automation/engine/parser/Compiler.cs#L5675-L5947
+binary_expression(
+  unique int id: @binary_expression,
+  int kind: int ref, // @token_kind ref
+  int left: @expression ref,
+  int right: @expression ref
+)
+
+// @binary_expression_kind = @And | @Is | @IsNot | @As | @DotDot | @Multiply | @Divide | @Rem | @Plus | @Minus | @Format | @Xor | @Shl | @Shr | @Band | @Bor | @Bxor | @Join | @Ieq | @Ine | @Ige | @Igt | @Ilt | @Ile | @Ilike | @Inotlike | @Inotmatch | @Imatch | @Ireplace | @Inotcontains | @Icontains | @Iin | @Inotin | @Isplit | @Ceq | @Cge | @Cgt | @Clt | @Cle | @Clike | @Cnotlike | @Cnotmatch | @Cmatch | @Ccontains | @Creplace | @Cin | @Cnotin | @Csplit | @QuestionQuestion;
+
+binary_expression_location(
+  int id: @binary_expression ref,
+  int loc: @location ref
+)
+
+// ConstantExpressionAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.constantexpressionast?view=powershellsdk-7.3.0
+constant_expression(
+  unique int id: @constant_expression,
+  string staticType: string ref
+)
+
+constant_expression_value(
+  int id: @constant_expression ref,
+  int value: @string_literal ref
+)
+
+constant_expression_location(
+  int id: @constant_expression ref,
+  int loc: @location ref
+)
+
+// ConvertExpressionAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.convertexpressionast?view=powershellsdk-7.3.0
+convert_expression(
+  unique int id: @convert_expression,
+  int the_attribute: @ast ref,
+  int child: @ast ref,
+  int object_type: @ast ref,
+  string staticType: string ref
+)
+
+convert_expression_location(
+  int id: @convert_expression ref,
+  int loc: @location ref
+)
+
+// IndexExpressionAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.indexexpressionast?view=powershellsdk-7.3.0
+index_expression(
+  unique int id: @index_expression,
+  int index: @ast ref,
+  int target: @ast ref,
+  boolean nullConditional: boolean ref
+)
+
+index_expression_location(
+  int id: @index_expression ref,
+  int loc: @location ref
+)
+
+// IfStatementAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.ifstatementast?view=powershellsdk-7.3.0
+if_statement(
+  unique int id: @if_statement
+)
+
+if_statement_clause(
+  int id: @if_statement ref,
+  int index: int ref,
+  int item1: @pipeline_base ref,
+  int item2: @statement_block ref
+)
+
+if_statement_else(
+  int id: @if_statement ref,
+  int elseItem: @statement_block ref 
+)
+
+if_statement_location(
+  int id: @if_statement ref,
+  int loc: @location ref
+)
+
+// MemberExpressionAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.memberexpressionast?view=powershellsdk-7.3.0
+member_expression(
+  unique int id: @member_expression,
+  int expression: @ast ref,
+  int member: @ast ref,
+  boolean nullConditional: boolean ref,
+  boolean isStatic: boolean ref
+)
+
+member_expression_location(
+  int id: @member_expression ref,
+  int loc: @location ref
+)
+
+// StatementBlockAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.statementblockast?view=powershellsdk-7.3.0
+statement_block(
+  unique int id: @statement_block,
+  int numStatements: int ref,
+  int numTraps : int ref
+)
+
+statement_block_location(
+  int id: @statement_block ref,
+  int loc: @location ref
+)
+
+statement_block_statement(
+  int id: @statement_block ref,
+  int index: int ref,
+  int statement: @statement ref
+)
+
+statement_block_trap(
+  int id: @statement_block ref,
+  int index: int ref,
+  int trap: @trap_statement ref
+)
+
+// SubExpressionAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.subexpressionast?view=powershellsdk-7.3.0
+sub_expression(
+  unique int id: @sub_expression,
+  int subExpression: @statement_block ref
+)
+
+sub_expression_location(
+  int id: @sub_expression ref,
+  int loc: @location ref
+)
+
+// VariableExpressionAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.variableexpressionast?view=powershellsdk-7.3.0
+variable_expression(
+  unique int id: @variable_expression,
+  string userPath: string ref,
+  string driveName: string ref,
+  boolean isConstant: boolean ref,
+  boolean isGlobal: boolean ref,
+  boolean isLocal: boolean ref,
+  boolean isPrivate: boolean ref,
+  boolean isScript: boolean ref,
+  boolean isUnqualified: boolean ref,
+  boolean isUnscoped: boolean ref,
+  boolean isVariable: boolean ref,
+  boolean isDriveQualified: boolean ref
+)
+
+variable_expression_location(
+  int id: @variable_expression ref,
+  int loc: @location ref
+)
+
+// CommandExpressionAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.commandexpressionast?view=powershellsdk-7.3.0
+command_expression(
+  unique int id: @command_expression,
+  int wrapped: @expression ref,
+  int numRedirections: int ref
+)
+
+command_expression_location(
+  int id: @command_expression ref,
+  int loc: @location ref
+)
+
+command_expression_redirection(
+  int id: @command_expression ref,
+  int index: int ref,
+  int redirection: @redirection ref
+)
+
+// StringConstantExpressionAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.stringconstantexpressionast?view=powershellsdk-7.3.0
+string_constant_expression(
+  unique int id: @string_constant_expression,
+  int value: @string_literal ref
+)
+
+string_constant_expression_location(
+  int id: @string_constant_expression ref,
+  int loc: @location ref
+)
+
+// PipelineAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.pipelineast?view=powershellsdk-7.3.0
+pipeline(
+  unique int id: @pipeline,
+  int numComponents: int ref
+)
+
+pipeline_location(
+  int id: @pipeline ref,
+  int loc: @location ref
+)
+
+pipeline_component(
+  int id: @pipeline ref,
+  int index: int ref,
+  int component: @command_base ref
+)
+
+// CommandAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.commandast?view=powershellsdk-7.3.0
+command(
+  unique int id: @command,
+  string name: string ref,
+  int kind: int ref, // @token_kind ref
+  int numElements: int ref,
+  int numRedirections: int ref
+)
+
+command_location(
+  int id: @command ref,
+  int loc: @location ref
+)
+
+command_command_element(
+  int id: @command ref,
+  int index: int ref,
+  int component: @command_element ref
+)
+
+command_redirection(
+  int id: @command ref,
+  int index: int ref,
+  int redirection: @redirection ref
+)
+
+// InvokeMemberExpressionAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.invokememberexpressionast?view=powershellsdk-7.3.0
+invoke_member_expression(
+  unique int id: @invoke_member_expression,
+  int expression: @expression ref,
+  int member: @command_element ref
+)
+
+invoke_member_expression_location(
+  int id: @invoke_member_expression ref,
+  int loc: @location ref
+)
+
+invoke_member_expression_argument(
+  int id: @invoke_member_expression ref,
+  int index: int ref,
+  int argument: @expression ref
+)
+
+// ParenExpressionAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.parenexpressionast?view=powershellsdk-7.3.0
+paren_expression(
+  unique int id: @paren_expression,
+  int expression: @pipeline_base ref
+)
+
+paren_expression_location(
+  int id: @paren_expression ref,
+  int loc: @location ref
+)
+
+
+// TernaryStatementAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.ternaryexpressionast?view=powershellsdk-7.3.0
+ternary_expression(
+  unique int id: @ternary_expression, 
+  int condition: @expression ref,
+  int ifFalse: @expression ref,
+  int iftrue: @expression ref
+)
+
+ternary_expression_location(
+  int id: @ternary_expression ref,
+  int loc: @location ref
+)
+
+// ExitStatementAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.exitstatementast?view=powershellsdk-7.3.0
+exit_statement(
+  unique int id: @exit_statement
+)
+
+exit_statement_pipeline(
+  int id: @exit_statement ref,
+  int expression: @pipeline_base ref
+)
+
+exit_statement_location(
+  int id: @exit_statement ref,
+  int loc: @location ref
+)
+
+
+// TypeExpressionAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.typeexpressionast?view=powershellsdk-7.3.0
+type_expression(
+  unique int id: @type_expression,
+  string name: string ref,
+  string fullName: string ref
+)
+
+type_expression_location(
+  int id: @type_expression ref,
+  int loc: @location ref
+)
+
+// CommandParameterAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.commandparameterast?view=powershellsdk-7.3.0
+command_parameter(
+  unique int id: @command_parameter,
+  string name: string ref
+)
+
+command_parameter_location(
+  int id: @command_parameter ref,
+  int loc: @location ref
+)
+
+command_parameter_argument(
+  int id: @command_parameter ref,
+  int argument: @ast ref
+)
+
+// NamedAttributeArgumentAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.namedattributeargumentast?view=powershellsdk-7.3.0
+named_attribute_argument(
+  unique int id: @named_attribute_argument,
+  string name: string ref,
+  int argument: @expression ref
+)
+
+named_attribute_argument_location(
+  int id: @named_attribute_argument ref,
+  int loc: @location ref
+)
+
+// AttributeAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.attributeast?view=powershellsdk-7.3.0
+attribute(
+  unique int id: @attribute,
+  string name: string ref,
+  int numNamedArguments: int ref,
+  int numPositionalArguments: int ref
+)
+
+attribute_named_argument(
+  int id: @attribute ref,
+  int index: int ref,
+  int argument: @named_attribute_argument ref
+)
+
+attribute_positional_argument(
+  int id: @attribute ref,
+  int index: int ref,
+  int argument: @expression ref
+)
+
+attribute_location(
+  int id: @attribute ref,
+  int id: @location ref
+)
+
+// ParamBlockAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.paramblockast?view=powershellsdk-7.3.0
+param_block(
+  unique int id: @param_block,
+  int numAttributes: int ref,
+  int numParameters: int ref
+)
+
+param_block_attribute(
+  int id: @param_block ref,
+  int index: int ref,
+  int the_attribute: @attribute ref
+)
+
+param_block_parameter(
+  int id: @param_block ref,
+  int index: int ref,
+  int the_parameter: @parameter ref
+)
+
+param_block_location(
+  int id: @param_block ref,
+  int id: @location ref
+)
+
+// ParameterAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.parameterast?view=powershellsdk-7.3.0
+parameter(
+  unique int id: @parameter,
+  int name: @variable_expression ref,
+  string staticType: string ref,
+  int numAttributes: int ref
+)
+
+parameter_attribute(
+  int id: @parameter ref,
+  int index: int ref,
+  int the_attribute: @attribute_base ref
+)
+
+parameter_location(
+  int id: @parameter ref,
+  int loc: @location ref
+)
+
+parameter_default_value(
+  int id: @parameter ref,
+  int default_value: @expression ref
+)
+
+// TypeConstraintAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.typeconstraintast?view=powershellsdk-7.3.0
+type_constraint(
+  unique int id: @type_constraint,
+  string name: string ref,
+  string fullName: string ref
+)
+
+type_constraint_location(
+  int id: @type_constraint ref,
+  int loc: @location ref
+)
+
+// FunctionDefinitionAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.functiondefinitionast?view=powershellsdk-7.3.0
+function_definition(
+  unique int id: @function_definition,
+  int body: @script_block ref,
+  string name: string ref,
+  boolean isFilter: boolean ref,
+  boolean isWorkflow: boolean ref
+)
+
+function_definition_parameter(
+  int id: @function_definition ref,
+  int index: int ref,
+  int parameter: @parameter ref
+)
+
+function_definition_location(
+  int id: @function_definition ref,
+  int loc: @location ref
+)
+
+// BreakStatementAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.breakstatementast?view=powershellsdk-7.3.0
+break_statement(
+  unique int id: @break_statement
+)
+
+break_statement_location(
+  int id: @break_statement ref,
+  int loc: @location ref
+)
+
+// ContinueStatementAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.continuestatementast?view=powershellsdk-7.3.0
+continue_statement(
+  unique int id: @continue_statement
+)
+
+continue_statement_location(
+  int id: @continue_statement ref,
+  int loc: @location ref
+)
+@labelled_statement = @continue_statement | @break_statement;
+
+statement_label(
+  int id: @labelled_statement ref,
+  int label: @expression ref
+)
+
+// ReturnStatementAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.returnstatementast?view=powershellsdk-7.3.0
+return_statement(
+  unique int id: @return_statement
+)
+
+return_statement_pipeline(
+  int id: @return_statement ref,
+  int pipeline: @pipeline_base ref
+)
+
+return_statement_location(
+  int id: @return_statement ref,
+  int loc: @location ref
+)
+
+// DoWhileStatementAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.dowhilestatementast?view=powershellsdk-7.3.0
+do_while_statement(
+  unique int id: @do_while_statement,
+  int body: @statement_block ref
+)
+
+do_while_statement_condition(
+  int id: @do_while_statement ref,
+  int condition: @pipeline_base ref
+)
+
+do_while_statement_location(
+  int id: @do_while_statement ref,
+  int loc: @location ref
+)
+
+// DoUntilStatementAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.dountilstatementast?view=powershellsdk-7.3.0
+do_until_statement(
+  unique int id: @do_until_statement,
+  int body: @statement_block ref
+)
+
+do_until_statement_condition(
+  int id: @do_until_statement ref,
+  int condition: @pipeline_base ref
+)
+
+do_until_statement_location(
+  int id: @do_until_statement ref,
+  int loc: @location ref
+)
+
+// WhileStatementAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.whilestatementast?view=powershellsdk-7.3.0
+while_statement(
+  unique int id: @while_statement,
+  int body: @statement_block ref
+)
+
+while_statement_condition(
+  int id: @while_statement ref,
+  int condition: @pipeline_base ref
+)
+
+while_statement_location(
+  int id: @while_statement ref,
+  int loc: @location ref
+)
+
+// ForEachStatementAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.foreachstatementast?view=powershellsdk-7.3.0
+foreach_statement(
+  unique int id: @foreach_statement,
+  int variable: @variable_expression ref,
+  int condition: @pipeline_base ref,
+  int body: @statement_block ref,
+  int flags: int ref
+)
+
+foreach_statement_location(
+  int id: @foreach_statement ref,
+  int loc: @location ref
+)
+
+// ForStatementAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.forstatementast?view=powershellsdk-7.3.0
+for_statement(
+  unique int id: @for_statement,
+  int body: @statement_block ref
+)
+
+for_statement_location(
+  int id: @for_statement ref,
+  int loc: @location ref
+)
+
+for_statement_condition(
+  int id: @for_statement ref,
+  int condition: @pipeline_base ref
+)
+
+for_statement_initializer(
+  int id: @for_statement ref,
+  int initializer: @pipeline_base ref
+)
+
+for_statement_iterator(
+  int id: @for_statement ref,
+  int iterator: @pipeline_base ref
+)
+
+// ExpandableStringExpressionAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.expandablestringexpressionast?view=powershellsdk-7.3.0
+expandable_string_expression(
+  unique int id: @expandable_string_expression,
+  int value: @string_literal ref,
+  int kind: int ref,
+  int numExpression: int ref
+)
+
+case @expandable_string_expression.kind of
+ 4 = @BareWord
+| 2 = @DoubleQuoted
+| 3 = @DoubleQuotedHereString
+| 0 = @SingleQuoted
+| 1 = @SingleQuotedHereString;
+
+expandable_string_expression_location(
+  int id: @expandable_string_expression ref,
+  int loc: @location ref
+)
+
+expandable_string_expression_nested_expression(
+  int id: @expandable_string_expression ref,
+  int index: int ref,
+  int nestedExression: @expression ref
+)
+
+// StringLiterals
+// Contains string literals broken into lines to prevent breaks in the trap from multiline strings
+string_literal(
+  unique int id: @string_literal
+)
+
+string_literal_location(
+  int id: @string_literal ref,
+  int loc: @location ref
+)
+
+string_literal_line(
+  int id: @string_literal ref,
+  int lineNum: int ref,
+  string line: string ref
+)
+
+// UnaryExpressionAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.unaryexpressionast?view=powershellsdk-7.3.0
+unary_expression(
+  unique int id: @unary_expression,
+  int child: @ast ref,
+  int kind: int ref,
+  string staticType: string ref
+)
+
+unary_expression_location(
+  int id: @unary_expression ref,
+  int loc: @location ref
+)
+
+// CatchClauseAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.catchclauseast?view=powershellsdk-7.3.0
+catch_clause(
+  unique int id: @catch_clause,
+  int body: @statement_block ref,
+  boolean isCatchAll: boolean ref
+)
+
+catch_clause_catch_type(
+  int id: @catch_clause ref,
+  int index: int ref,
+  int catch_type: @type_constraint ref
+)
+
+catch_clause_location(
+  int id: @catch_clause ref,
+  int loc: @location ref
+)
+
+// ThrowStatementAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.throwstatementast?view=powershellsdk-7.3.0
+throw_statement(
+  unique int id: @throw_statement,
+  boolean isRethrow: boolean ref
+)
+
+throw_statement_location(
+  int id: @throw_statement ref,
+  int loc: @location ref
+)
+
+throw_statement_pipeline(
+  int id: @throw_statement ref,
+  int pipeline: @ast ref
+)
+
+// TryStatementAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.trystatementast?view=powershellsdk-7.3.0
+try_statement(
+  unique int id: @try_statement,
+  int body: @statement_block ref
+)
+
+try_statement_catch_clause(
+  int id: @try_statement ref,
+  int index: int ref,
+  int catch_clause: @catch_clause ref
+)
+
+
+try_statement_finally(
+  int id: @try_statement ref,
+  int finally: @ast ref
+)
+
+try_statement_location(
+  int id: @try_statement ref,
+  int loc: @location ref
+)
+
+// FileRedirectionAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.fileredirectionast?view=powershellsdk-7.3.0
+file_redirection(
+  unique int id: @file_redirection,
+  int location: @ast ref,
+  boolean isAppend: boolean ref,
+  int redirectionType: int ref
+)
+
+case @file_redirection.redirectionType of
+ 0 = @All
+| 1 = @Output
+| 2 = @Error
+| 3 = @Warning
+| 4 = @Verbose
+| 5 = @Debug
+| 6 = @Information;
+
+file_redirection_location(
+  int id: @file_redirection ref,
+  int loc: @location ref
+)
+
+// BlockStatementAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.blockstatementast?view=powershellsdk-7.3.0
+block_statement(
+  unique int id: @block_statement,
+  int body: @ast ref,
+  int token: @token ref
+)
+
+block_statement_location(
+  int id: @block_statement ref,
+  int loc: @location ref
+)
+
+// Token
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.token?view=powershellsdk-7.3.0
+token(
+  unique int id: @token,
+  boolean hasError: boolean ref,
+  int kind: int ref,
+  string text: string ref,
+  int tokenFlags: int ref
+)
+
+token_location(
+  int id: @token ref,
+  int loc: @location ref
+)
+
+// ConfigurationDefinitionAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.configurationdefinitionast?view=powershellsdk-7.3.0
+configuration_definition(
+  unique int id: @configuration_definition,
+  int body: @script_block_expression ref,
+  int configurationType: int ref,
+  int name: @expression ref
+)
+
+configuration_definition_location(
+  int id: @configuration_definition ref,
+  int loc: @location ref
+)
+
+// DataStatementAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.datastatementast?view=powershellsdk-7.3.0
+data_statement(
+  unique int id: @data_statement,
+  int body: @statement_block ref
+)
+
+data_statement_variable(
+  int id: @data_statement ref,
+  string variable: string ref
+)
+
+data_statement_commands_allowed(
+  int id: @data_statement ref,
+  int index: int ref,
+  int command_allowed: @ast ref
+)
+
+data_statement_location(
+  int id: @data_statement ref,
+  int loc: @location ref
+)
+
+// DynamicKeywordStatementAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.dynamickeywordstatementast?view=powershellsdk-7.3.0
+dynamic_keyword_statement(
+  unique int id: @dynamic_keyword_statement
+)
+
+dynamic_keyword_statement_command_elements(
+  int id: @dynamic_keyword_statement ref,
+  int index: int ref,
+  int element: @command_element ref
+)
+
+dynamic_keyword_statement_location(
+  int id: @dynamic_keyword_statement ref,
+  int loc: @location ref
+)
+
+// ErrorExpressionAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.errorexpressionast?view=powershellsdk-7.3.0
+error_expression(
+  unique int id: @error_expression
+)
+
+error_expression_nested_ast(
+  int id: @error_expression ref,
+  int index: int ref,
+  int nested_ast: @ast ref
+)
+
+error_expression_location(
+  int id: @error_expression ref,
+  int loc: @location ref
+)
+
+// ErrorStatementAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.errorstatementast?view=powershellsdk-7.3.0
+error_statement(
+  unique int id: @error_statement,
+  int token: @token ref
+)
+
+error_statement_location(
+  int id: @error_statement ref,
+  int loc: @location ref
+)
+
+error_statement_nested_ast(
+  int id: @error_statement ref,
+  int index: int ref,
+  int nested_ast: @ast ref
+)
+
+error_statement_conditions(
+  int id: @error_statement ref,
+  int index: int ref,
+  int condition: @ast ref
+)
+
+error_statement_bodies(
+  int id: @error_statement ref,
+  int index: int ref,
+  int body: @ast ref
+)
+
+error_statement_flag(
+  int id: @error_statement ref,
+  int index: int ref,
+  int k: string ref, // The key
+  int token: @token ref, // These two form a tuple of the value
+  int ast: @ast ref
+)
+
+// FunctionMemberAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.functionmemberast?view=powershellsdk-7.3.0
+function_member(
+  unique int id: @function_member,
+  int body: @ast ref,
+  boolean isConstructor: boolean ref,
+  boolean isHidden: boolean ref,
+  boolean isPrivate: boolean ref,
+  boolean isPublic: boolean ref,
+  boolean isStatic: boolean ref,
+  string name: string ref,
+  int methodAttributes: int ref
+)
+
+function_member_location(
+  int id: @function_member ref,
+  int loc: @location ref
+)
+
+function_member_parameter(
+  int id: @function_member ref,
+  int index: int ref,
+  int parameter: @ast ref
+)
+
+function_member_attribute(
+  int id: @function_member ref,
+  int index: int ref,
+  int attribute: @ast ref
+)
+
+function_member_return_type(
+  int id: @function_member ref,
+  int return_type: @type_constraint ref
+)
+
+// MergingRedirectionAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.mergingredirectionast?view=powershellsdk-7.3.0
+merging_redirection(
+  unique int id: @merging_redirection,
+  int from: int ref,
+  int to: int ref
+)
+
+merging_redirection_location(
+  int id: @merging_redirection ref,
+  int loc: @location ref
+)
+
+
+label(
+  int id: @labeled_statement ref,
+  string label: string ref
+)
+
+// TrapStatementAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.trapstatementast?view=powershellsdk-7.3.0
+trap_statement(
+  unique int id: @trap_statement,
+  int body: @ast ref
+)
+
+trap_statement_type(
+  int id: @trap_statement ref,
+  int trap_type: @type_constraint ref
+)
+
+trap_statement_location(
+  int id: @trap_statement ref,
+  int loc: @location ref
+)
+
+// PipelineChainAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.pipelinechainast?view=powershellsdk-7.3.0
+pipeline_chain(
+  unique int id: @pipeline_chain,
+  boolean isBackground: boolean ref,
+  int kind: int ref,
+  int left: @ast ref,
+  int right: @ast ref
+)
+
+pipeline_chain_location(
+  int id: @pipeline_chain ref,
+  int loc: @location ref
+)
+
+// PropertyMemberAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.propertymemberast?view=powershellsdk-7.3.0
+property_member(
+  unique int id: @property_member,
+  boolean isHidden: boolean ref,
+  boolean isPrivate: boolean ref,
+  boolean isPublic: boolean ref,
+  boolean isStatic: boolean ref,
+  string name: string ref,
+  int methodAttributes: int ref
+)
+
+property_member_attribute(
+  int id: @property_member ref,
+  int index: int ref,
+  int attribute: @ast ref
+)
+
+property_member_property_type(
+  int id: @property_member ref,
+  int property_type: @type_constraint ref
+)
+
+property_member_initial_value(
+  int id: @property_member ref,
+  int initial_value: @ast ref
+)
+
+property_member_location(
+  int id: @property_member ref,
+  int loc: @location ref
+)
+
+// ScriptBlockExpressionAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.scriptblockexpressionast?view=powershellsdk-7.3.0
+script_block_expression(
+  unique int id: @script_block_expression,
+  int body: @script_block ref
+)
+
+script_block_expression_location(
+  int id: @script_block_expression ref,
+  int loc: @location ref
+)
+
+// SwitchStatementAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.switchstatementast?view=powershellsdk-7.3.0
+switch_statement(
+  unique int id: @switch_statement,
+  int condition: @ast ref,
+  int flags: int ref
+)
+
+switch_statement_clauses(
+  int id: @switch_statement ref,
+  int index: int ref,
+  int expression: @ast ref,
+  int statementBlock: @ast ref
+)
+
+switch_statement_location(
+  int id: @switch_statement ref,
+  int loc: @location ref
+)
+
+switch_statement_default(
+  int id: @switch_statement ref,
+  int default: @ast ref
+)
+
+// TypeDefinitionAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.typedefinitionast?view=powershellsdk-7.3.0
+type_definition(
+  unique int id: @type_definition,
+  string name: string ref,
+  int flags: int ref,
+  boolean isClass: boolean ref,
+  boolean isEnum: boolean ref,
+  boolean isInterface: boolean ref
+)
+
+type_definition_attributes(
+  int id: @type_definition ref,
+  int index: int ref,
+  int attribute: @ast ref
+)
+
+type_definition_members(
+  int id: @type_definition ref,
+  int index: int ref,
+  int member: @ast ref
+)
+
+type_definition_location(
+  int id: @type_definition ref,
+  int loc: @location ref
+)
+
+type_definition_base_type(
+  int id: @type_definition ref,
+  int index: int ref,
+  int base_type: @type_constraint ref
+)
+
+// UsingExpressionAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.usingexpressionast?view=powershellsdk-7.3.0
+using_expression(
+  unique int id: @using_expression,
+  int subExpression: @ast ref
+)
+
+using_expression_location(
+  int id: @using_expression ref,
+  int loc: @location ref
+)
+
+// UsingStatementAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.usingstatementast?view=powershellsdk-7.3.0
+using_statement(
+  unique int id: @using_statement,
+  int kind: int ref
+)
+
+using_statement_location(
+  int id: @using_statement ref,
+  int loc: @location ref
+)
+
+using_statement_alias(
+  int id: @using_statement ref,
+  int alias: @ast ref
+)
+
+using_statement_module_specification(
+  int id: @using_statement ref,
+  int module_specification: @ast ref
+)
+
+using_statement_name(
+  int id: @using_statement ref,
+  int name: @ast ref
+)
+
+// HashTableAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.hashtableast?view=powershellsdk-7.3.0
+hash_table(
+  unique int id: @hash_table
+)
+
+hash_table_location(
+  int id: @hash_table ref,
+  int loc: @location ref
+)
+
+hash_table_key_value_pairs(
+  int id: @hash_table ref,
+  int index: int ref,
+  int k: @ast ref,
+  int v: @ast ref
+)
+
+// AttributedExpressionAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.attributedexpressionast?view=powershellsdk-7.3.0
+attributed_expression(
+  unique int id: @attributed_expression,
+  int attribute: @ast ref,
+  int expression: @ast ref
+)
+
+attributed_expression_location(
+  int id: @attributed_expression ref,
+  int loc: @location ref
+)
+
+// TokenKind
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.tokenkind?view=powershellsdk-7.3.0
+token_kind_reference(
+  unique int id: @token_kind_reference,
+  string name: string ref,
+  int kind: int ref
+)
+
+@token_kind = @ampersand | @and | @andAnd | @as | @assembly | @atCurly | @atParen | @band | @base | @begin | @bnot | @bor | @break 
+| @bxor | @catch | @ccontains | @ceq | @cge | @cgt | @cin | @class | @cle | @clean | @clike | @clt | @cmatch | @cne | @cnotcontains 
+| @cnotin | @cnotlike | @cnotmatch | @colon | @colonColon | @comma | @command_token | @comment | @configuration | @continue | @creplace 
+| @csplit | @data | @default | @define | @divide | @divideEquals | @do | @dollarParen | @dot | @dotDot | @dynamicKeyword | @dynamicparam 
+| @else | @elseIf | @end | @endOfInput | @enum | @equals | @exclaim | @exit | @filter | @finally | @for | @foreach | @format | @from 
+| @function | @generic | @hereStringExpandable | @hereStringLiteral | @hidden | @icontains | @identifier | @ieq | @if | @ige | @igt 
+| @iin | @ile | @ilike | @ilt | @imatch | @in | @ine | @inlineScript | @inotcontains | @inotin | @inotlike | @inotmatch | @interface 
+| @ireplace | @is | @isNot | @isplit | @join | @label | @lBracket | @lCurly | @lineContinuation | @lParen | @minus | @minusEquals 
+| @minusMinus | @module | @multiply | @multiplyEquals | @namespace | @newLine | @not | @number | @or | @orOr | @parallel | @param 
+| @parameter_token | @pipe | @plus | @plusEquals | @plusPlus | @postfixMinusMinus | @postfixPlusPlus | @private | @process | @public 
+| @questionDot | @questionLBracket | @questionMark | @questionQuestion | @questionQuestionEquals | @rBracket | @rCurly | @redirectInStd 
+| @redirection_token | @rem | @remainderEquals | @return | @rParen | @semi | @sequence | @shl | @shr | @splattedVariable | @static 
+| @stringExpandable | @stringLiteral_token | @switch | @throw | @trap | @try | @type | @unknown | @until | @using | @var | @variable 
+| @while | @workflow | @xor;
+
+case @token_kind_reference.kind of
+28 = @ampersand // The invocation operator '&'.
+| 53 = @and // The logical and operator '-and'.
+| 26 = @andAnd // The (unimplemented) operator '&&'.
+| 94 = @as // The type conversion operator '-as'.
+| 165 = @assembly // The 'assembly' keyword
+| 23 = @atCurly // The opening token of a hash expression '@{'.
+| 22 = @atParen // The opening token of an array expression '@('.
+| 56 = @band // The bitwise and operator '-band'.
+| 168 = @base // The 'base' keyword
+| 119 = @begin // The 'begin' keyword.
+| 52 = @bnot // The bitwise not operator '-bnot'.
+| 57 = @bor // The bitwise or operator '-bor'.
+| 120 = @break // The 'break' keyword.
+| 58 = @bxor // The bitwise exclusive or operator '-xor'.
+| 121 = @catch // The 'catch' keyword.
+| 87 = @ccontains // The case sensitive contains operator '-ccontains'.
+| 76 = @ceq // The case sensitive equal operator '-ceq'.
+| 78 = @cge // The case sensitive greater than or equal operator '-cge'.
+| 79 = @cgt // The case sensitive greater than operator '-cgt'.
+| 89 = @cin // The case sensitive in operator '-cin'.
+| 122 = @class // The 'class' keyword.
+| 81 = @cle // The case sensitive less than or equal operator '-cle'.
+| 170 = @clean // The 'clean' keyword.
+| 82 = @clike // The case sensitive like operator '-clike'.
+| 80 = @clt // The case sensitive less than operator '-clt'.
+| 84 = @cmatch // The case sensitive match operator '-cmatch'.
+| 77 = @cne // The case sensitive not equal operator '-cne'.
+| 88 = @cnotcontains // The case sensitive not contains operator '-cnotcontains'.
+| 90 = @cnotin // The case sensitive not in operator '-notin'.
+| 83 = @cnotlike // The case sensitive notlike operator '-cnotlike'.
+| 85 = @cnotmatch // The case sensitive not match operator '-cnotmatch'.
+| 99 = @colon // The PS class base class and implemented interfaces operator ':'. Also used in base class ctor calls.
+| 34 = @colonColon // The static member access operator '::'.
+| 30 = @comma // The unary or binary array operator ','.
+| 166 = @command_token // The 'command' keyword
+| 10 = @comment // A single line comment, or a delimited comment.
+| 155 = @configuration // The "configuration" keyword
+| 123 = @continue // The 'continue' keyword.
+| 86 = @creplace // The case sensitive replace operator '-creplace'.
+| 91 = @csplit // The case sensitive split operator '-csplit'.
+| 124 = @data // The 'data' keyword.
+| 169 = @default // The 'default' keyword
+| 125 = @define // The (unimplemented) 'define' keyword.
+| 38 = @divide // The division operator '/'.
+| 46 = @divideEquals // The division assignment operator '/='.
+| 126 = @do // The 'do' keyword.
+| 24 = @dollarParen // The opening token of a sub-expression '$('.
+| 35 = @dot // The instance member access or dot source invocation operator '.'.
+| 33 = @dotDot // The range operator '..'.
+| 156 = @dynamicKeyword // The token kind for dynamic keywords
+| 127 = @dynamicparam // The 'dynamicparam' keyword.
+| 128 = @else // The 'else' keyword.
+| 129 = @elseIf // The 'elseif' keyword.
+| 130 = @end // The 'end' keyword.
+| 11 = @endOfInput // Marks the end of the input script or file.
+| 161 = @enum // The 'enum' keyword
+| 42 = @equals // The assignment operator '='.
+| 36 = @exclaim // The logical not operator '!'.
+| 131 = @exit // The 'exit' keyword.
+| 132 = @filter // The 'filter' keyword.
+| 133 = @finally // The 'finally' keyword.
+| 134 = @for // The 'for' keyword.
+| 135 = @foreach // The 'foreach' keyword.
+| 50 = @format // The string format operator '-f'.
+| 136 = @from // The (unimplemented) 'from' keyword.
+| 137 = @function // The 'function' keyword.
+| 7 = @generic // A token that is only valid as a command name, command argument, function name, or configuration name. It may contain characters not allowed in identifiers. Tokens with this kind are always instances of StringLiteralToken or StringExpandableToken if the token contains variable references or subexpressions.
+| 15 = @hereStringExpandable // A double quoted here string literal. Tokens with this kind are always instances of StringExpandableToken. even if there are no nested tokens to expand.
+| 14 = @hereStringLiteral // A single quoted here string literal. Tokens with this kind are always instances of StringLiteralToken.
+| 167 = @hidden // The 'hidden' keyword
+| 71 = @icontains // The case insensitive contains operator '-icontains' or '-contains'.
+| 6 = @identifier // A simple identifier, always begins with a letter or '', and is followed by letters, numbers, or ''.
+| 60 = @ieq // The case insensitive equal operator '-ieq' or '-eq'.
+| 138 = @if // The 'if' keyword.
+| 62 = @ige // The case insensitive greater than or equal operator '-ige' or '-ge'.
+| 63 = @igt // The case insensitive greater than operator '-igt' or '-gt'.
+| 73 = @iin // The case insensitive in operator '-iin' or '-in'.
+| 65 = @ile // The case insensitive less than or equal operator '-ile' or '-le'.
+| 66 = @ilike // The case insensitive like operator '-ilike' or '-like'.
+| 64 = @ilt // The case insensitive less than operator '-ilt' or '-lt'.
+| 68 = @imatch // The case insensitive match operator '-imatch' or '-match'.
+| 139 = @in // The 'in' keyword.
+| 61 = @ine // The case insensitive not equal operator '-ine' or '-ne'.
+| 154 = @inlineScript // The 'InlineScript' keyword
+| 72 = @inotcontains // The case insensitive notcontains operator '-inotcontains' or '-notcontains'.
+| 74 = @inotin // The case insensitive notin operator '-inotin' or '-notin'
+| 67 = @inotlike // The case insensitive not like operator '-inotlike' or '-notlike'.
+| 69 = @inotmatch // The case insensitive not match operator '-inotmatch' or '-notmatch'.
+| 160 = @interface // The 'interface' keyword
+| 70 = @ireplace // The case insensitive replace operator '-ireplace' or '-replace'.
+| 92 = @is // The type test operator '-is'.
+| 93 = @isNot // The type test operator '-isnot'.
+| 75 = @isplit // The case insensitive split operator '-isplit' or '-split'.
+| 59 = @join // The join operator '-join'.
+| 5 = @label // A label token - always begins with ':', followed by the label name. Tokens with this kind are always instances of LabelToken.
+| 20 = @lBracket // The opening square brace token '['.
+| 18 = @lCurly // The opening curly brace token '{'.
+| 9 = @lineContinuation // A line continuation (backtick followed by newline).
+| 16 = @lParen // The opening parenthesis token '('.
+| 41 = @minus // The substraction operator '-'.
+| 44 = @minusEquals // The subtraction assignment operator '-='.
+| 31 = @minusMinus // The pre-decrement operator '--'.
+| 163 = @module // The 'module' keyword
+| 37 = @multiply // The multiplication operator '*'.
+| 45 = @multiplyEquals // The multiplication assignment operator '*='.
+| 162 = @namespace // The 'namespace' keyword
+| 8 = @newLine // A newline (one of '\n', '\r', or '\r\n').
+| 51 = @not // The logical not operator '-not'.
+| 4 = @number // Any numerical literal token. Tokens with this kind are always instances of NumberToken.
+| 54 = @or // The logical or operator '-or'.
+| 27 = @orOr // The (unimplemented) operator '||'.
+| 152 = @parallel // The 'parallel' keyword.
+| 140 = @param // The 'param' keyword.
+| 3 = @parameter_token // A parameter to a command, always begins with a dash ('-'), followed by the parameter name. Tokens with this kind are always instances of ParameterToken.
+| 29 = @pipe // The pipe operator '|'.
+| 40 = @plus // The addition operator '+'.
+| 43 = @plusEquals // The addition assignment operator '+='.
+| 32 = @plusPlus // The pre-increment operator '++'.
+| 96 = @postfixMinusMinus // The post-decrement operator '--'.
+| 95 = @postfixPlusPlus // The post-increment operator '++'.
+| 158 = @private // The 'private' keyword
+| 141 = @process // The 'process' keyword.
+| 157 = @public // The 'public' keyword
+| 103 = @questionDot // The null conditional member access operator '?.'.
+| 104 = @questionLBracket // The null conditional index access operator '?[]'.
+| 100 = @questionMark // The ternary operator '?'.
+| 102 = @questionQuestion // The null coalesce operator '??'.
+| 101 = @questionQuestionEquals // The null conditional assignment operator '??='.
+| 21 = @rBracket // The closing square brace token ']'.
+| 19 = @rCurly // The closing curly brace token '}'.
+| 49 = @redirectInStd // The (unimplemented) stdin redirection operator '<'.
+| 48 = @redirection_token // A redirection operator such as '2>&1' or '>>'.
+| 39 = @rem // The modulo division (remainder) operator '%'.
+| 47 = @remainderEquals // The modulo division (remainder) assignment operator '%='.
+| 142 = @return // The 'return' keyword.
+| 17 = @rParen // The closing parenthesis token ')'.
+| 25 = @semi // The statement terminator ';'.
+| 153 = @sequence // The 'sequence' keyword.
+| 97 = @shl // The shift left operator.
+| 98 = @shr // The shift right operator.
+| 2 = @splattedVariable // A splatted variable token, always begins with '@' and followed by the variable name. Tokens with this kind are always instances of VariableToken.
+| 159 = @static // The 'static' keyword
+| 13 = @stringExpandable // A double quoted string literal. Tokens with this kind are always instances of StringExpandableToken even if there are no nested tokens to expand.
+| 12 = @stringLiteral_token // A single quoted string literal. Tokens with this kind are always instances of StringLiteralToken.
+| 143 = @switch // The 'switch' keyword.
+| 144 = @throw // The 'throw' keyword.
+| 145 = @trap // The 'trap' keyword.
+| 146 = @try // The 'try' keyword.
+| 164 = @type // The 'type' keyword
+| 0 = @unknown // An unknown token, signifies an error condition.
+| 147 = @until // The 'until' keyword.
+| 148 = @using // The (unimplemented) 'using' keyword.
+| 149 = @var // The (unimplemented) 'var' keyword.
+| 1 = @variable // A variable token, always begins with '$' and followed by the variable name, possibly enclose in curly braces. Tokens with this kind are always instances of VariableToken.
+| 150 = @while // The 'while' keyword.
+| 151 = @workflow // The 'workflow' keyword.
+| 55 = @xor; // The logical exclusive or operator '-xor'.
\ No newline at end of file
diff --git a/powershell/downgrades/c5191f89a6e3e8cea428b5c7326a06e335738533/upgrade.properties b/powershell/downgrades/c5191f89a6e3e8cea428b5c7326a06e335738533/upgrade.properties
new file mode 100644
index 00000000000..85e8fc29174
--- /dev/null
+++ b/powershell/downgrades/c5191f89a6e3e8cea428b5c7326a06e335738533/upgrade.properties
@@ -0,0 +1,3 @@
+description: Add is_in_psmodule_path relation
+compatibility: full
+is_in_psmodule_path.rel: delete
\ No newline at end of file
diff --git a/powershell/extractor/Semmle.Extraction.PowerShell.Standalone/Options.cs b/powershell/extractor/Semmle.Extraction.PowerShell.Standalone/Options.cs
index caf2c6f0012..fa3b88fa1e0 100644
--- a/powershell/extractor/Semmle.Extraction.PowerShell.Standalone/Options.cs
+++ b/powershell/extractor/Semmle.Extraction.PowerShell.Standalone/Options.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -24,6 +25,9 @@ namespace Semmle.Extraction.PowerShell.Standalone
                 case "dry-run":
                     SkipExtraction = value;
                     return true;
+                case "skip-psmodulepath-files":
+                    SkipPSModulePathFiles = value;
+                    return true;
                 default:
                     return base.HandleFlag(key, value);
             }
@@ -74,7 +78,7 @@ namespace Semmle.Extraction.PowerShell.Standalone
         /// <summary>
         /// List of extensions to include.
         /// </summary>
-        public IList<string> Extensions { get; } = new List<string>() { ".ps1" };
+        public IList<string> Extensions { get; } = new List<string>() { ".ps1", ".psd1" };
 
         /// <summary>
         /// Files/patterns to exclude.
@@ -117,6 +121,24 @@ namespace Semmle.Extraction.PowerShell.Standalone
             }
         }
 
+        /// <summary>
+        /// Returns true if the extractor should skip files in the PSModulePath because the
+        /// environment variable CODEQL_EXTRACTOR_POWERSHELL_OPTION_SKIP_PSMODULEPATH_FILES
+        /// is set to a truthy value.
+        /// </summary>
+        private static bool GetDefaultSkipPSModulePathFiles()
+        {
+            var skip = System.Environment.GetEnvironmentVariable(
+                "CODEQL_EXTRACTOR_POWERSHELL_OPTION_SKIP_PSMODULEPATH_FILES"
+            );
+            bool b = skip != null && skip.ToLower() != "false";
+            if (b)
+            {
+                System.Console.WriteLine("Skipping files in PSModulePath");
+            }
+            return b;
+        }
+
         /// <summary>
         /// The directory or file containing the source code;
         /// </summary>
@@ -127,6 +149,12 @@ namespace Semmle.Extraction.PowerShell.Standalone
         /// </summary>
         public bool SkipExtraction { get; private set; } = false;
 
+        /// <summary>
+        /// Whether to extract files in the paths found in the `PSModulePath`
+        /// environment variable.
+        /// </summary>
+        public bool SkipPSModulePathFiles { get; private set; } = GetDefaultSkipPSModulePathFiles();
+
         /// <summary>
         /// Whether errors were encountered parsing the arguments.
         /// </summary>
@@ -158,13 +186,18 @@ namespace Semmle.Extraction.PowerShell.Standalone
                 "PowerShell# standalone extractor\n\nExtracts PowerShell scripts in the current directory.\n"
             );
             output.WriteLine("Additional options:\n");
-            output.WriteLine("    <path>           Use the provided path instead.");
+            output.WriteLine("    <path>                       Use the provided path instead.");
             output.WriteLine(
-                "    --exclude:xxx    Exclude a file or directory (can be specified multiple times)"
+                "    --exclude:xxx                Exclude a file or directory (can be specified multiple times)"
+            );
+            output.WriteLine("    --dry-run                    Stop before extraction");
+            output.WriteLine(
+                "    --threads:nnn                Specify number of threads (default=CPU cores)"
+            );
+            output.WriteLine("    --verbose                    Produce more output");
+            output.WriteLine(
+                "    --skip-psmodulepath-files    Avoid extracting source files in paths specified by the PSModulePath environment variable."
             );
-            output.WriteLine("    --dry-run        Stop before extraction");
-            output.WriteLine("    --threads:nnn    Specify number of threads (default=CPU cores)");
-            output.WriteLine("    --verbose        Produce more output");
         }
 
         private Options() { }
diff --git a/powershell/extractor/Semmle.Extraction.PowerShell.Standalone/Program.cs b/powershell/extractor/Semmle.Extraction.PowerShell.Standalone/Program.cs
index c57ef3b1a0d..8fd95081c82 100644
--- a/powershell/extractor/Semmle.Extraction.PowerShell.Standalone/Program.cs
+++ b/powershell/extractor/Semmle.Extraction.PowerShell.Standalone/Program.cs
@@ -45,7 +45,8 @@ namespace Semmle.Extraction.PowerShell.Standalone
 
             output.Log(Severity.Info, "Running PowerShell standalone extractor");
             var sourceFiles = options
-                .Files.Where(d =>
+                .Files.Concat(GetPSModuleFiles(options))
+                .Where(d =>
                     options.Extensions.Contains(
                         d.Extension,
                         StringComparer.InvariantCultureIgnoreCase
@@ -87,6 +88,30 @@ namespace Semmle.Extraction.PowerShell.Standalone
             return 0;
         }
 
+        private static String[] GetPSModulePaths()
+        {
+            return Environment.GetEnvironmentVariable("PSModulePath")?.Split(Path.PathSeparator)
+                ?? Array.Empty<string>();
+        }
+
+        private static IEnumerable<FileInfo> GetPSModuleFiles(Options options)
+        {
+            if(options.SkipPSModulePathFiles)
+            {
+                return Array.Empty<FileInfo>();
+            }
+            
+            return GetPSModulePaths()
+                .Where(d => Directory.Exists(d))
+                .SelectMany(d =>
+                {
+                    var di = new DirectoryInfo(d);
+                    return di.Exists
+                        ? di.GetFiles("*.*", SearchOption.AllDirectories)
+                        : new FileInfo[] { new(d) };
+                });
+        }
+
         private class ExtractionProgress : IProgressMonitor
         {
             public ExtractionProgress(ILogger output)
diff --git a/powershell/extractor/Semmle.Extraction.PowerShell/Entities/Base/File.cs b/powershell/extractor/Semmle.Extraction.PowerShell/Entities/Base/File.cs
index 7ae07b5b2ad..9a4820c2811 100644
--- a/powershell/extractor/Semmle.Extraction.PowerShell/Entities/Base/File.cs
+++ b/powershell/extractor/Semmle.Extraction.PowerShell/Entities/Base/File.cs
@@ -2,6 +2,7 @@ using Semmle.Util;
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 
 namespace Semmle.Extraction.PowerShell.Entities
 {
@@ -14,6 +15,18 @@ namespace Semmle.Extraction.PowerShell.Entities
         {
         }
 
+        private static string[] GetPSModulePaths()
+        {
+            return Environment.GetEnvironmentVariable("PSModulePath")?.Split(Path.PathSeparator)
+                ?? Array.Empty<string>();
+        }
+
+        private bool PathIsInPSModulePath()
+        {
+            // Check if f's path is inside one of the paths in $Env:PSModulePath
+            return GetPSModulePaths().Any(originalPath.StartsWith);
+        }
+
         public override void Populate(TextWriter trapFile)
         {
             trapFile.files(this, TransformedPath.Value);
@@ -23,6 +36,11 @@ namespace Semmle.Extraction.PowerShell.Entities
                 trapFile.containerparent(Extraction.Entities.Folder.Create(PowerShellContext, dir), this);
             }
 
+            if(PathIsInPSModulePath())
+            {
+                trapFile.is_in_psmodule_path(this);
+            }
+
             try
             {
                 System.Text.Encoding encoding;
diff --git a/powershell/extractor/Semmle.Extraction/Tuples.cs b/powershell/extractor/Semmle.Extraction/Tuples.cs
index 2cff4bfbdf1..8c4a49b8ffe 100644
--- a/powershell/extractor/Semmle.Extraction/Tuples.cs
+++ b/powershell/extractor/Semmle.Extraction/Tuples.cs
@@ -32,5 +32,9 @@ namespace Semmle.Extraction
         {
             trapFile.WriteTuple("locations_default", label, file, startLine, startCol, endLine, endCol);
         }
+
+        public static void is_in_psmodule_path(this System.IO.TextWriter trapFile, Entities.File file) {
+            trapFile.WriteTuple("is_in_psmodule_path", file);
+        }
     }
 }
diff --git a/powershell/ql/lib/powershell.qll b/powershell/ql/lib/powershell.qll
index 41890c0dc14..8bbfe93262a 100644
--- a/powershell/ql/lib/powershell.qll
+++ b/powershell/ql/lib/powershell.qll
@@ -81,4 +81,5 @@ import semmle.code.powershell.HashTable
 import semmle.code.powershell.SplitExpr
 import semmle.code.powershell.CommentEntity
 import semmle.code.powershell.Variable
-import semmle.code.powershell.internal.Internal::Public
\ No newline at end of file
+import semmle.code.powershell.internal.Internal::Public
+import semmle.code.powershell.ModuleManifest
\ No newline at end of file
diff --git a/powershell/ql/lib/qlpack.yml b/powershell/ql/lib/qlpack.yml
index 8accccc6390..1632e530e5f 100644
--- a/powershell/ql/lib/qlpack.yml
+++ b/powershell/ql/lib/qlpack.yml
@@ -12,4 +12,8 @@ dependencies:
   codeql/dataflow: ${workspace}
   codeql/ssa: ${workspace}
   codeql/util: ${workspace}
+  codeql/mad: ${workspace}
+dataExtensions:
+  - semmle/code/powershell/frameworks/**/model.yml
+  - semmle/code/powershell/frameworks/**/*.model.yml
 warnOnImplicitThis: true
\ No newline at end of file
diff --git a/powershell/ql/lib/semmle/code/powershell/ApiGraphs.qll b/powershell/ql/lib/semmle/code/powershell/ApiGraphs.qll
new file mode 100644
index 00000000000..7fe18c97f6e
--- /dev/null
+++ b/powershell/ql/lib/semmle/code/powershell/ApiGraphs.qll
@@ -0,0 +1,701 @@
+/**
+ * Provides an implementation of _API graphs_, which allow efficient modelling of how a given
+ * value is used by the code base or how values produced by the code base are consumed by a library.
+ *
+ * See `API::Node` for more details.
+ */
+
+private import powershell
+private import semmle.code.powershell.dataflow.DataFlow
+private import semmle.code.powershell.typetracking.ApiGraphShared
+private import semmle.code.powershell.typetracking.internal.TypeTrackingImpl
+private import semmle.code.powershell.controlflow.Cfg
+private import semmle.code.powershell.dataflow.internal.DataFlowPrivate as DataFlowPrivate
+private import semmle.code.powershell.dataflow.internal.DataFlowDispatch as DataFlowDispatch
+
+/**
+ * Provides classes and predicates for working with APIs used in a database.
+ */
+module API {
+  /**
+   * A node in the API graph, that is, a value that can be tracked interprocedurally.
+   *
+   * The API graph is a graph for tracking values of certain types in a way that accounts for inheritance
+   * and interprocedural data flow.
+   *
+   * API graphs are typically used to identify "API calls", that is, calls to an external function
+   * whose implementation is not necessarily part of the current codebase.
+   *
+   * ### Basic usage
+   *
+   * The most basic use of API graphs is typically as follows:
+   * 1. Start with `API::getTopLevelMember` for the relevant library.
+   * 2. Follow up with a chain of accessors such as `getMethod` describing how to get to the relevant API function.
+   * 3. Map the resulting API graph nodes to data-flow nodes, using `asSource`, `asSink`, or `asCall`.
+   *
+   * ### Data flow
+   *
+   * The members predicates on this class generally take inheritance and data flow into account.
+   *
+   * ### Backward data flow
+   *
+   * When inspecting the arguments of a call, the data flow direction is backwards.
+   *
+   * ### Inheritance
+   *
+   * When a class or module object is tracked, inheritance is taken into account.
+   *
+   * ### Backward data flow and classes
+   *
+   * When inspecting the arguments of a call, and the value flowing into that argument is a user-defined class (or an instance thereof),
+   * uses of `getMethod` will find method definitions in that class (including inherited ones) rather than finding method calls.
+   *
+   * When modeling an external library that is known to call a specific method on a parameter, this makes
+   * it possible to find the corresponding method definition in user code.
+   *
+   * ### Strict left-to-right evaluation
+   *
+   * Most member predicates on this class are intended to be chained, and are always evaluated from left to right, which means
+   * the caller should restrict the initial set of values.
+   *
+   * For example, in the following snippet, we always find the uses of `Foo` before finding calls to `bar`:
+   * ```ql
+   * API::getTopLevelMember("Foo").getMethod("bar")
+   * ```
+   * In particular, the implementation will never look for calls to `bar` and work backward from there.
+   *
+   * Beware of the footgun that is to use API graphs with an unrestricted receiver:
+   * ```ql
+   * API::Node barCall(API::Node base) {
+   *   result = base.getMethod("bar") // Do not do this!
+   * }
+   * ```
+   * The above predicate does not restrict the receiver, and will thus perform an interprocedural data flow
+   * search starting at every node in the graph, which is very expensive.
+   */
+  class Node extends Impl::TApiNode {
+    /**
+     * Gets a data-flow node where this value may flow interprocedurally.
+     *
+     * This is similar to `asSource()` but additionally includes nodes that are transitively reachable by data flow.
+     * See `asSource()` for examples.
+     */
+    bindingset[this]
+    pragma[inline_late]
+    DataFlow::Node getAValueReachableFromSource() {
+      result = getAValueReachableFromSourceInline(this)
+    }
+
+    /**
+     * Gets a data-flow node where this value enters the current codebase.
+     */
+    bindingset[this]
+    pragma[inline_late]
+    DataFlow::LocalSourceNode asSource() { result = asSourceInline(this) }
+
+    /** Gets a data-flow node where this value potentially flows into an external library. */
+    bindingset[this]
+    pragma[inline_late]
+    DataFlow::Node asSink() { result = asSinkInline(this) }
+
+    /** Gets a callable that can reach this sink. */
+    bindingset[this]
+    pragma[inline_late]
+    DataFlow::CallableNode asCallable() { Impl::asCallable(this.getAnEpsilonSuccessor(), result) }
+
+    /**
+     * Get a data-flow node that transitively flows to this value, provided that this value corresponds
+     * to a sink.
+     *
+     * This is similar to `asSink()` but additionally includes nodes that transitively reach a sink by data flow.
+     * See `asSink()` for examples.
+     */
+    bindingset[this]
+    pragma[inline_late]
+    DataFlow::Node getAValueReachingSink() { result = getAValueReachingSinkInline(this) }
+
+    /** Gets the call referred to by this API node. */
+    bindingset[this]
+    pragma[inline_late]
+    DataFlow::CallNode asCall() { this = Impl::MkMethodAccessNode(result) }
+
+    pragma[inline]
+    Node getMember(string m) {
+      // This predicate is currently not 'inline_late' because 'm' can be an input or output
+      Impl::memberEdge(this.getAnEpsilonSuccessor(), m, result)
+    }
+
+    /**
+     * Gets a node that may refer to an instance of the module or class represented by this API node.
+     */
+    bindingset[this]
+    pragma[inline_late]
+    Node getInstance() { Impl::instanceEdge(this.getAnEpsilonSuccessor(), result) }
+
+    /**
+     * Gets a call to `method` with this value as the receiver, or the definition of `method` on
+     * an object that can reach this sink.
+     */
+    pragma[inline]
+    Node getMethod(string method) {
+      // TODO: Consider 'getMethodTarget(method)' for looking up method definitions?
+      // This predicate is currently not 'inline_late' because 'method' can be an input or output
+      Impl::methodEdge(this.getAnEpsilonSuccessor(), method, result)
+    }
+
+    /**
+     * Gets the result of this call, or the return value of this callable.
+     */
+    bindingset[this]
+    pragma[inline_late]
+    Node getReturn() { Impl::returnEdge(this.getAnEpsilonSuccessor(), result) }
+
+    /**
+     * Gets the result of a call to `method` with this value as the receiver, or the return value of `method` defined on
+     * an object that can reach this sink.
+     *
+     * This is a shorthand for `getMethod(method).getReturn()`.
+     */
+    pragma[inline]
+    Node getReturn(string method) {
+      // This predicate is currently not 'inline_late' because 'method' can be an input or output
+      result = this.getMethod(method).getReturn()
+    }
+
+    /**
+     * Gets the `n`th positional argument to this call.
+     */
+    pragma[inline]
+    Node getArgument(int n) {
+      // This predicate is currently not 'inline_late' because 'n' can be an input or output
+      Impl::positionalArgumentEdge(this, n, result)
+    }
+
+    /**
+     * Gets the given keyword argument to this call.
+     */
+    pragma[inline]
+    Node getKeywordArgument(string name) {
+      // This predicate is currently not 'inline_late' because 'name' can be an input or output
+      Impl::keywordArgumentEdge(this, name, result)
+    }
+
+    /**
+     * Gets the `n`th positional parameter of this callable, or the `n`th  positional argument to this call.
+     *
+     * Note: for historical reasons, this predicate may refer to an argument of a call, but this may change in the future.
+     * When referring to an argument, it is recommended to use `getArgument(n)` instead.
+     */
+    pragma[inline]
+    Node getParameter(int n) {
+      // This predicate is currently not 'inline_late' because 'n' can be an input or output
+      Impl::positionalParameterOrArgumentEdge(this.getAnEpsilonSuccessor(), n, result)
+    }
+
+    /**
+     * Gets the given keyword parameter of this callable, or keyword argument to this call.
+     *
+     * Note: for historical reasons, this predicate may refer to an argument of a call, but this may change in the future.
+     * When referring to an argument, it is recommended to use `getKeywordArgument(n)` instead.
+     */
+    pragma[inline]
+    Node getKeywordParameter(string name) {
+      // This predicate is currently not 'inline_late' because 'name' can be an input or output
+      Impl::keywordParameterOrArgumentEdge(this.getAnEpsilonSuccessor(), name, result)
+    }
+
+    /**
+     * Gets the argument passed in argument position `pos` at this call.
+     */
+    pragma[inline]
+    Node getArgumentAtPosition(DataFlowDispatch::ArgumentPosition pos) {
+      // This predicate is currently not 'inline_late' because 'pos' can be an input or output
+      Impl::argumentEdge(pragma[only_bind_out](this), pos, result) // note: no need for epsilon step since 'this' must be a call
+    }
+
+    /**
+     * Gets the parameter at position `pos` of this callable.
+     */
+    pragma[inline]
+    Node getParameterAtPosition(DataFlowDispatch::ParameterPosition pos) {
+      // This predicate is currently not 'inline_late' because 'pos' can be an input or output
+      Impl::parameterEdge(this.getAnEpsilonSuccessor(), pos, result)
+    }
+
+    /**
+     * Gets a representative for the `content` of this value.
+     *
+     * When possible, it is preferrable to use one of the specialized variants of this predicate, such as `getAnElement`.
+     *
+     * Concretely, this gets sources where `content` is read from this value, and as well as sinks where
+     * `content` is stored onto this value or onto an object that can reach this sink.
+     */
+    pragma[inline]
+    Node getContent(DataFlow::Content content) {
+      // This predicate is currently not 'inline_late' because 'content' can be an input or output
+      Impl::contentEdge(this.getAnEpsilonSuccessor(), content, result)
+    }
+
+    /**
+     * Gets a representative for the `contents` of this value.
+     *
+     * See `getContent()` for more details.
+     */
+    bindingset[this, contents]
+    pragma[inline_late]
+    Node getContents(DataFlow::ContentSet contents) {
+      // We always use getAStoreContent when generating content edges, and we always use getAReadContent when querying the graph.
+      result = this.getContent(contents.getAReadContent())
+    }
+
+    /**
+     * Gets a representative for the instance field of the given `name`.
+     */
+    pragma[inline]
+    Node getField(string name) {
+      // This predicate is currently not 'inline_late' because 'name' can be an input or output
+      Impl::fieldEdge(this.getAnEpsilonSuccessor(), name, result)
+    }
+
+    /**
+     * Gets a representative for an arbitrary element of this collection.
+     */
+    bindingset[this]
+    pragma[inline_late]
+    Node getAnElement() { Impl::elementEdge(this.getAnEpsilonSuccessor(), result) }
+
+    /**
+     * Gets the data-flow node that gives rise to this node, if any.
+     */
+    DataFlow::Node getInducingNode() {
+      this = Impl::MkMethodAccessNode(result) or
+      this = Impl::MkBackwardNode(result, _) or
+      this = Impl::MkForwardNode(result, _) or
+      this = Impl::MkSinkNode(result)
+    }
+
+    /** Gets the location of this node. */
+    Location getLocation() {
+      result = this.getInducingNode().getLocation()
+      or
+      this instanceof RootNode and
+      result instanceof EmptyLocation
+    }
+
+    /**
+     * Gets a textual representation of this element.
+     */
+    string toString() { none() }
+
+    pragma[inline]
+    private Node getAnEpsilonSuccessor() { result = getAnEpsilonSuccessorInline(this) }
+  }
+
+  /** The root node of an API graph. */
+  private class RootNode extends Node, Impl::MkRoot {
+    override string toString() { result = "Root()" }
+  }
+
+  /** A node representing a given type-tracking state when tracking forwards. */
+  private class ForwardNode extends Node, Impl::MkForwardNode {
+    private DataFlow::LocalSourceNode node;
+    private TypeTracker tracker;
+
+    ForwardNode() { this = Impl::MkForwardNode(node, tracker) }
+
+    override string toString() {
+      if tracker.start()
+      then result = "ForwardNode(" + node + ")"
+      else result = "ForwardNode(" + node + ", " + tracker + ")"
+    }
+  }
+
+  /** A node representing a given type-tracking state when tracking backwards. */
+  private class BackwardNode extends Node, Impl::MkBackwardNode {
+    private DataFlow::LocalSourceNode node;
+    private TypeTracker tracker;
+
+    BackwardNode() { this = Impl::MkBackwardNode(node, tracker) }
+
+    override string toString() {
+      if tracker.start()
+      then result = "BackwardNode(" + node + ")"
+      else result = "BackwardNode(" + node + ", " + tracker + ")"
+    }
+  }
+
+  /** A node representing a module/class object with epsilon edges to its descendents. */
+  private class ModuleNode extends Node, Impl::MkModule {
+    string qualifiedModule;
+    int n;
+
+    ModuleNode() { this = Impl::MkModule(qualifiedModule, n) }
+
+    ModuleNode getNext() { result = Impl::MkModule(qualifiedModule, n + 1) }
+
+    ModuleNode getPred() { result.getNext() = this }
+
+    string getComponent() { result = qualifiedModule.splitAt(".", n) }
+
+    string getModule() {
+      not exists(this.getPred()) and
+      result = this.getComponent()
+      or
+      result = this.getPred().getModule() + "." + this.getComponent()
+    }
+
+    override string toString() { result = "Module(" + this.getModule() + ")" }
+  }
+
+  /** A node representing instances of a module/class with epsilon edges to its ancestors. */
+  private class InstanceUp extends Node, Impl::MkInstanceUp {
+    /** Gets the module whose instances are represented by this API node. */
+    string getType() { this = Impl::MkInstanceUp(result) }
+
+    override string toString() { result = "ModuleInstanceUp(" + this.getType() + ")" }
+  }
+
+  /** A node representing instances of a module/class with epsilon edges to its descendents. */
+  private class InstanceDownNode extends Node, Impl::MkInstanceDown {
+    /** Gets the module whose instances are represented by this API node. */
+    string getType() { this = Impl::MkInstanceDown(result) }
+
+    override string toString() { result = "ModuleInstanceDown(" + this.getType() + ")" }
+  }
+
+  /** A node corresponding to the method being invoked at a method call. */
+  class MethodAccessNode extends Node, Impl::MkMethodAccessNode {
+    override string toString() { result = "MethodAccessNode(" + this.asCall() + ")" }
+  }
+
+  /**
+   * A node corresponding to an argument, right-hand side of a store, or return value from a callable.
+   *
+   * Such a node may serve as the starting-point of backtracking, and has epsilon edges going to
+   * the backward nodes corresponding to `getALocalSource`.
+   */
+  private class SinkNode extends Node, Impl::MkSinkNode {
+    override string toString() { result = "SinkNode(" + this.getInducingNode() + ")" }
+  }
+
+  /**
+   * An API entry point.
+   *
+   * By default, API graph nodes are only created for nodes that come from an external
+   * library or escape into an external library. The points where values are cross the boundary
+   * between codebases are called "entry points".
+   *
+   * Anything in the global scope is considered to be an entry point, but
+   * additional entry points may be added by extending this class.
+   */
+  abstract class EntryPoint extends string {
+    // Note: this class can be deprecated in Ruby, but is still referenced by shared code in ApiGraphModels.qll,
+    // where it can't be removed since other languages are still dependent on the EntryPoint class.
+    bindingset[this]
+    EntryPoint() { any() }
+
+    /** Gets a data-flow node corresponding to a use-node for this entry point. */
+    DataFlow::LocalSourceNode getASource() { none() }
+
+    /** Gets a data-flow node corresponding to a def-node for this entry point. */
+    DataFlow::Node getASink() { none() }
+
+    /** Gets a call corresponding to a method access node for this entry point. */
+    DataFlow::CallNode getACall() { none() }
+
+    /** Gets an API-node for this entry point. */
+    API::Node getANode() { Impl::entryPointEdge(this, result) }
+  }
+
+  // Ensure all entry points are imported from ApiGraphs.qll
+  private module ImportEntryPoints {
+    private import semmle.code.powershell.frameworks.data.ModelsAsData
+  }
+
+  /** Gets the root node. */
+  Node root() { result instanceof RootNode }
+
+  /**
+   * Gets the node that represents the module with qualified
+   * name `qualifiedModule`.
+   */
+  ModuleNode mod(string qualifiedModule, int n) { result = Impl::MkModule(qualifiedModule, n) }
+
+  /**
+   * Gets an unqualified call at the top-level with the given method name.
+   */
+  pragma[inline]
+  MethodAccessNode getTopLevelCall(string name) { Impl::toplevelCall(name, result) }
+
+  pragma[nomagic]
+  private predicate isReachable(DataFlow::LocalSourceNode node, TypeTracker t) {
+    t.start() and exists(node)
+    or
+    exists(DataFlow::LocalSourceNode prev, TypeTracker t2 |
+      isReachable(prev, t2) and
+      node = prev.track(t2, t)
+    )
+  }
+
+  private module SharedArg implements ApiGraphSharedSig {
+    class ApiNode = Node;
+
+    ApiNode getForwardNode(DataFlow::LocalSourceNode node, TypeTracker t) {
+      result = Impl::MkForwardNode(node, t)
+    }
+
+    ApiNode getBackwardNode(DataFlow::LocalSourceNode node, TypeTracker t) {
+      result = Impl::MkBackwardNode(node, t)
+    }
+
+    ApiNode getSinkNode(DataFlow::Node node) { result = Impl::MkSinkNode(node) }
+
+    pragma[nomagic]
+    predicate specificEpsilonEdge(ApiNode pred, ApiNode succ) { none() }
+  }
+
+  /** INTERNAL USE ONLY. */
+  module Internal {
+    private module MkShared = ApiGraphShared<SharedArg>;
+
+    import MkShared
+  }
+
+  private import Internal
+  import Internal::Public
+
+  cached
+  private module Impl {
+    private predicate isGacModule(string s) {
+      s =
+        [
+          "System.Management.Automation",
+          "Microsoft.Management.Infrastructure",
+          "Microsoft.PowerShell.Security",
+          "Microsoft.PowerShell.Commands.Management",
+          "Microsoft.PowerShell.Commands.Utility"
+        ]
+    }
+
+    private predicate isModule(string s, int n) {
+      (
+        any(UsingStmt using).getName() = s
+        or
+        any(Cmd cmd).getNamespaceQualifier() = s
+        or
+        any(TypeNameExpr tn).getName() = s
+        or
+        any(ModuleManifest manifest).getModuleName() = s
+        or
+        isGacModule(s)
+      ) and
+      exists(s.splitAt(".", n))
+    }
+
+    cached
+    newtype TApiNode =
+      /** The root of the API graph. */
+      MkRoot() or
+      /** The method accessed at `call`, synthetically treated as a separate object. */
+      MkMethodAccessNode(DataFlow::CallNode call) or
+      MkModule(string qualifiedModule, int n) { isModule(qualifiedModule, n) } or
+      /** Instances of `mod` with epsilon edges to its ancestors. */
+      MkInstanceUp(string qualifiedType) { exists(MkModule(qualifiedType, _)) } or
+      /** Instances of `mod` with epsilon edges to its descendents, and to its upward node. */
+      MkInstanceDown(string qualifiedType) { exists(MkModule(qualifiedType, _)) } or
+      /** Intermediate node for following forward data flow. */
+      MkForwardNode(DataFlow::LocalSourceNode node, TypeTracker t) { isReachable(node, t) } or
+      /** Intermediate node for following backward data flow. */
+      MkBackwardNode(DataFlow::LocalSourceNode node, TypeTracker t) { isReachable(node, t) } or
+      MkSinkNode(DataFlow::Node node) { needsSinkNode(node) }
+
+    private predicate needsSinkNode(DataFlow::Node node) {
+      node instanceof DataFlowPrivate::ArgumentNode
+      or
+      TypeTrackingInput::storeStep(node, _, _)
+      or
+      node = any(DataFlow::CallableNode callable).getAReturnNode()
+      or
+      node = any(EntryPoint e).getASink()
+    }
+
+    bindingset[e]
+    pragma[inline_late]
+    private DataFlow::Node getNodeFromExpr(Expr e) { result.asExpr().getExpr() = e }
+
+    cached
+    predicate toplevelCall(string name, Node node) {
+      exists(DataFlow::CallNode call |
+        call.asExpr().getExpr().getEnclosingScope() instanceof TopLevel and
+        call.getName() = name and
+        node = MkMethodAccessNode(call)
+      )
+    }
+
+    cached
+    predicate callEdge(Node pred, string name, Node succ) {
+      exists(DataFlow::CallNode call |
+        // from receiver to method call node
+        pred = getForwardEndNode(getALocalSourceStrict(call.getQualifier())) and
+        succ = MkMethodAccessNode(call) and
+        name = call.getName()
+      )
+    }
+
+    cached
+    predicate memberEdge(Node pred, string name, Node succ) {
+      exists(MemberExpr member | succ = getForwardStartNode(getNodeFromExpr(member)) |
+        pred = getForwardEndNode(getALocalSourceStrict(getNodeFromExpr(member.getQualifier()))) and
+        name = member.getMemberName()
+      )
+    }
+
+    cached
+    predicate methodEdge(Node pred, string name, Node succ) {
+      exists(DataFlow::CallNode call | succ = MkMethodAccessNode(call) and name = call.getName() |
+        pred = getForwardEndNode(getALocalSourceStrict(call.getQualifier()))
+        or
+        exists(string qualifiedModule, ModuleManifest manifest, int n |
+          pred = mod(qualifiedModule, n) and
+          not exists(mod(qualifiedModule, n + 1)) and
+          manifest.getModuleName() = qualifiedModule
+        |
+          manifest.getACmdLetToExport() = name
+          or
+          manifest.getAFunctionToExport() = name
+        )
+      )
+    }
+
+    cached
+    predicate asCallable(Node apiNode, DataFlow::CallableNode callable) {
+      apiNode = getBackwardStartNode(callable)
+    }
+
+    cached
+    predicate contentEdge(Node pred, DataFlow::Content content, Node succ) {
+      exists(DataFlow::Node object, DataFlow::Node value, DataFlow::ContentSet c |
+        TypeTrackingInput::loadStep(object, value, c) and
+        content = c.getAStoreContent() and
+        // `x -> x.foo` with content "foo"
+        pred = getForwardOrBackwardEndNode(getALocalSourceStrict(object)) and
+        succ = getForwardStartNode(value)
+        or
+        // Based on `object.c = value` generate `object -> value` with content `c`
+        TypeTrackingInput::storeStep(value, object, c) and
+        content = c.getAStoreContent() and
+        pred = getForwardOrBackwardEndNode(getALocalSourceStrict(object)) and
+        succ = MkSinkNode(value)
+      )
+    }
+
+    cached
+    predicate fieldEdge(Node pred, string name, Node succ) {
+      Impl::contentEdge(pred, DataFlowPrivate::TFieldContent(name), succ)
+    }
+
+    cached
+    predicate elementEdge(Node pred, Node succ) {
+      contentEdge(pred, any(DataFlow::ContentSet set | set.isAnyElement()).getAReadContent(), succ)
+    }
+
+    cached
+    predicate parameterEdge(Node pred, DataFlowDispatch::ParameterPosition paramPos, Node succ) {
+      exists(DataFlowPrivate::ParameterNodeImpl parameter, DataFlow::CallableNode callable |
+        parameter.isSourceParameterOf(callable.asCallableAstNode(), paramPos) and
+        pred = getBackwardEndNode(callable) and
+        succ = getForwardStartNode(parameter)
+      )
+    }
+
+    cached
+    predicate argumentEdge(Node pred, DataFlowDispatch::ArgumentPosition argPos, Node succ) {
+      exists(DataFlow::CallNode call, DataFlowPrivate::ArgumentNode argument |
+        argument.sourceArgumentOf(call.asExpr(), argPos) and
+        pred = MkMethodAccessNode(call) and
+        succ = MkSinkNode(argument)
+      )
+    }
+
+    cached
+    predicate positionalArgumentEdge(Node pred, int n, Node succ) {
+      argumentEdge(pred,
+        any(DataFlowDispatch::ArgumentPosition pos |
+          pos.isPositional(n, DataFlowPrivate::emptyNamedSet())
+        ), succ)
+    }
+
+    cached
+    predicate keywordArgumentEdge(Node pred, string name, Node succ) {
+      argumentEdge(pred, any(DataFlowDispatch::ArgumentPosition pos | pos.isKeyword(name)), succ)
+    }
+
+    private predicate positionalParameterEdge(Node pred, int n, Node succ) {
+      parameterEdge(pred,
+        any(DataFlowDispatch::ParameterPosition pos |
+          pos.isPositional(n, DataFlowPrivate::emptyNamedSet())
+        ), succ)
+    }
+
+    private predicate keywordParameterEdge(Node pred, string name, Node succ) {
+      parameterEdge(pred, any(DataFlowDispatch::ParameterPosition pos | pos.isKeyword(name)), succ)
+    }
+
+    cached
+    predicate positionalParameterOrArgumentEdge(Node pred, int n, Node succ) {
+      positionalArgumentEdge(pred, n, succ)
+      or
+      positionalParameterEdge(pred, n, succ)
+    }
+
+    cached
+    predicate keywordParameterOrArgumentEdge(Node pred, string name, Node succ) {
+      keywordArgumentEdge(pred, name, succ)
+      or
+      keywordParameterEdge(pred, name, succ)
+    }
+
+    cached
+    predicate instanceEdge(Node pred, Node succ) {
+      exists(string qualifiedType, int n |
+        pred = MkModule(qualifiedType, n) and
+        not exists(MkModule(qualifiedType, n + 1))
+      |
+        exists(DataFlow::TypeNameNode typeName |
+          typeName.getTypeName() = qualifiedType and
+          succ = getForwardStartNode(typeName)
+        )
+        or
+        exists(DataFlow::ObjectCreationNode objCreation |
+          objCreation.getConstructedTypeName() = qualifiedType and
+          succ = getForwardStartNode(objCreation)
+        )
+        or
+        exists(DataFlow::ParameterNode p |
+          p.getParameter().getStaticType() = qualifiedType and
+          succ = getForwardStartNode(p)
+        )
+      )
+    }
+
+    cached
+    predicate returnEdge(Node pred, Node succ) {
+      exists(DataFlow::CallNode call |
+        pred = MkMethodAccessNode(call) and
+        succ = getForwardStartNode(call)
+      )
+      or
+      exists(DataFlow::CallableNode callable |
+        pred = getBackwardEndNode(callable) and
+        succ = MkSinkNode(callable.getAReturnNode())
+      )
+    }
+
+    cached
+    predicate entryPointEdge(EntryPoint entry, Node node) {
+      node = MkSinkNode(entry.getASink()) or
+      node = getForwardStartNode(entry.getASource()) or
+      node = MkMethodAccessNode(entry.getACall())
+    }
+  }
+}
diff --git a/powershell/ql/lib/semmle/code/powershell/Call.qll b/powershell/ql/lib/semmle/code/powershell/Call.qll
index e630ebc1409..b5516344cc6 100644
--- a/powershell/ql/lib/semmle/code/powershell/Call.qll
+++ b/powershell/ql/lib/semmle/code/powershell/Call.qll
@@ -6,6 +6,8 @@ private import semmle.code.powershell.controlflow.CfgNodes
 abstract private class AbstractCall extends Ast {
   abstract Expr getCommand();
 
+  abstract string getName();
+
   /** Gets the i'th argument to this call. */
   abstract Expr getArgument(int i);
 
@@ -34,6 +36,8 @@ class CmdCall extends AbstractCall instanceof Cmd {
 
   final override Expr getPositionalArgument(int i) { result = Cmd.super.getPositionalArgument(i) }
 
+  final override string getName() { result = Cmd.super.getCommandName() }
+
   final override Expr getArgument(int i) { result = Cmd.super.getArgument(i) }
 
   final override Expr getNamedArgument(string name) { result = Cmd.super.getNamedArgument(name) }
@@ -68,6 +72,8 @@ class MethodCall extends AbstractCall instanceof InvokeMemberExpr {
       result.getBody() = getTarget(call)
     )
   }
+
+  final override string getName() { result = InvokeMemberExpr.super.getName() }
 }
 
 final class Call = AbstractCall;
diff --git a/powershell/ql/lib/semmle/code/powershell/Command.qll b/powershell/ql/lib/semmle/code/powershell/Command.qll
index 5617704789e..ffc63c91ff3 100644
--- a/powershell/ql/lib/semmle/code/powershell/Command.qll
+++ b/powershell/ql/lib/semmle/code/powershell/Command.qll
@@ -1,11 +1,51 @@
 import powershell
 
+private predicate parseCommandName(Cmd cmd, string namespace, string name) {
+  exists(string qualified | command(cmd, qualified, _, _, _) |
+    namespace = qualified.regexpCapture("([^\\\\]+)\\\\([^\\\\]+)", 1) and
+    name = qualified.regexpCapture("([^\\\\]+)\\\\([^\\\\]+)", 2)
+    or
+    // Not a qualified name
+    not exists(qualified.indexOf("\\")) and
+    namespace = "" and
+    name = qualified
+  )
+}
+
+/** A call to a command. */
 class Cmd extends @command, CmdBase {
-  override string toString() { result = this.getCommandName() }
+  override string toString() {
+    exists(string name | name = this.getQualifiedCommandName() |
+      if name = "" then result = "call" else result = "call to " + name
+    )
+    or
+    not exists(this.getQualifiedCommandName()) and
+    result = "call"
+  }
 
   override SourceLocation getLocation() { command_location(this, result) }
 
-  string getCommandName() { command(this, result, _, _, _) }
+  /** Gets the name of the command without any qualifiers. */
+  string getCommandName() { parseCommandName(this, _, result) }
+
+  /** Holds if the command is qualified. */
+  predicate isQualified() { parseCommandName(this, any(string s | s != ""), _) }
+
+  /** Gets the namespace qualifier of this command, if any. */
+  string getNamespaceQualifier() {
+    result != "" and
+    parseCommandName(this, result, _)
+    or
+    // Implicit import because it's in a module manifest
+    parseCommandName(this, "", _) and
+    exists(ModuleManifest manifest |
+      manifest.getACmdLetToExport() = this.getCommandName() and
+      result = manifest.getModuleName()
+    )
+  }
+
+  /** Gets the (possibly qualified) name of this command. */
+  string getQualifiedCommandName() { command(this, result, _, _, _) }
 
   int getKind() { command(this, _, result, _, _) }
 
@@ -15,8 +55,10 @@ class Cmd extends @command, CmdBase {
 
   CmdElement getElement(int i) { command_command_element(this, i, result) }
 
+  /** Gets the expression that determines the command to invoke. */
   Expr getCommand() { result = this.getElement(0) }
 
+  /** Gets the name of this command, if this is statically known. */
   StringConstExpr getCmdName() { result = this.getElement(0) }
 
   /** Gets any argument to this command. */
@@ -65,3 +107,8 @@ class Cmd extends @command, CmdBase {
 
   Redirection getARedirection() { result = this.getRedirection(_) }
 }
+
+/** A call to operator `&`. */
+class CallOperator extends Cmd {
+  CallOperator() { this.getKind() = 28 }
+}
diff --git a/powershell/ql/lib/semmle/code/powershell/File.qll b/powershell/ql/lib/semmle/code/powershell/File.qll
index 5fbadd59626..be6316235d8 100644
--- a/powershell/ql/lib/semmle/code/powershell/File.qll
+++ b/powershell/ql/lib/semmle/code/powershell/File.qll
@@ -209,6 +209,10 @@ class File extends Container, @file {
     not this.isStub()
   }
 
+  predicate isInPSModulePath() {
+    is_in_psmodule_path(this)
+  }
+
   /** Holds if this file is a library. */
   predicate fromLibrary() {
     not this.getBaseName() = "" and
diff --git a/powershell/ql/lib/semmle/code/powershell/Frameworks.qll b/powershell/ql/lib/semmle/code/powershell/Frameworks.qll
new file mode 100644
index 00000000000..8d69ab9b32c
--- /dev/null
+++ b/powershell/ql/lib/semmle/code/powershell/Frameworks.qll
@@ -0,0 +1,7 @@
+/**
+ * Helper file that imports all framework modeling.
+ */
+
+import semmle.code.powershell.frameworks.SystemManagementAutomationRunspaces.Runspaces
+import semmle.code.powershell.frameworks.SystemManagementAutomationPowerShell.PowerShell
+import semmle.code.powershell.frameworks.SystemManagementAutomationEngineIntrinsics.EngineIntrinsics
diff --git a/powershell/ql/lib/semmle/code/powershell/HashTable.qll b/powershell/ql/lib/semmle/code/powershell/HashTable.qll
index edfcd2eb92e..5bd825a18f4 100644
--- a/powershell/ql/lib/semmle/code/powershell/HashTable.qll
+++ b/powershell/ql/lib/semmle/code/powershell/HashTable.qll
@@ -7,6 +7,10 @@ class HashTableExpr extends @hash_table, Expr {
 
   Stmt getElement(Expr key) { hash_table_key_value_pairs(this, _, key, result) } // TODO: Change @ast to @expr in db scheme
 
+  Stmt getElementFromConstant(string key) {
+    result = this.getElement(any(StringConstExpr sc | sc.getValue().getValue() = key))
+  }
+
   predicate hasKey(Expr key) { exists(this.getElement(key)) }
 
   Stmt getAnElement() { result = this.getElement(_) }
diff --git a/powershell/ql/lib/semmle/code/powershell/InvokeMemberExpression.qll b/powershell/ql/lib/semmle/code/powershell/InvokeMemberExpression.qll
index 7cd9d71a615..c11d542cb22 100644
--- a/powershell/ql/lib/semmle/code/powershell/InvokeMemberExpression.qll
+++ b/powershell/ql/lib/semmle/code/powershell/InvokeMemberExpression.qll
@@ -9,6 +9,8 @@ class InvokeMemberExpr extends @invoke_member_expression, MemberExprBase {
 
   CmdElement getMember() { invoke_member_expression(this, _, result) }
 
+  string getMemberName() { result = this.getMember().(StringConstExpr).getValue().getValue() }
+
   Expr getArgument(int i) { invoke_member_expression_argument(this, i, result) }
 
   Expr getAnArgument() { invoke_member_expression_argument(this, _, result) }
diff --git a/powershell/ql/lib/semmle/code/powershell/MemberExpr.qll b/powershell/ql/lib/semmle/code/powershell/MemberExpr.qll
index 5af9eef345c..1d6d143c053 100644
--- a/powershell/ql/lib/semmle/code/powershell/MemberExpr.qll
+++ b/powershell/ql/lib/semmle/code/powershell/MemberExpr.qll
@@ -3,7 +3,7 @@ import powershell
 class MemberExpr extends @member_expression, MemberExprBase {
   final override Location getLocation() { member_expression_location(this, result) }
 
-  Expr getBase() { member_expression(this, result, _, _, _) }
+  Expr getQualifier() { member_expression(this, result, _, _, _) }
 
   CmdElement getMember() { member_expression(this, _, result, _, _) }
 
diff --git a/powershell/ql/lib/semmle/code/powershell/ModuleManifest.qll b/powershell/ql/lib/semmle/code/powershell/ModuleManifest.qll
new file mode 100644
index 00000000000..691216d391d
--- /dev/null
+++ b/powershell/ql/lib/semmle/code/powershell/ModuleManifest.qll
@@ -0,0 +1,44 @@
+import powershell
+
+class ModuleManifestFile extends File {
+  ModuleManifestFile() { this.getExtension() = "psd1" }
+}
+
+private Expr getEntry(HashTableExpr ht, string key) {
+  result = ht.getElementFromConstant(key).(CmdExpr).getExpr() and
+  not result instanceof ArrayLiteral
+}
+
+private Expr getAnEntry(HashTableExpr ht, string key) {
+  exists(Expr e | e = ht.getElementFromConstant(key).(CmdExpr).getExpr() |
+    not e instanceof ArrayLiteral and result = e
+    or
+    result = e.(ArrayLiteral).getAnElement()
+  )
+}
+
+class ModuleManifest extends HashTableExpr {
+  string moduleVersion;
+
+  ModuleManifest() {
+    // The hash table is in a .psd1 file
+    this.getLocation().getFile() instanceof ModuleManifestFile and
+    // It's at the top level of the file
+    this.getParent().(CmdExpr).getParent().(NamedBlock).getParent() instanceof TopLevel and
+    // It has a `ModuleVersion` entry. The only required field is ModuleVersion.
+    // https://learn.microsoft.com/en-us/powershell/scripting/developer/module/how-to-write-a-powershell-module-manifest?view=powershell-7.4#to-create-and-use-a-module-manifest
+    moduleVersion = getEntry(this, "ModuleVersion").getValue().asString()
+  }
+
+  string getModuleVersion() { result = moduleVersion }
+
+  string getModuleName() {
+    result + ".psd1" = this.getLocation().getFile().getBaseName()
+  }
+
+  string getAFunctionToExport() {
+    result = getAnEntry(this, "FunctionsToExport").getValue().asString()
+  }
+
+  string getACmdLetToExport() { result = getAnEntry(this, "CmdletsToExport").getValue().asString() }
+}
diff --git a/powershell/ql/lib/semmle/code/powershell/Type.qll b/powershell/ql/lib/semmle/code/powershell/Type.qll
index 11eb1afa6e7..d67aea74ad1 100644
--- a/powershell/ql/lib/semmle/code/powershell/Type.qll
+++ b/powershell/ql/lib/semmle/code/powershell/Type.qll
@@ -22,4 +22,10 @@ class Type extends @type_definition, Stmt {
   }
 
   Method getAMethod() { result = this.getMethod(_) }
+
+  TypeConstraint getBaseType(int i) { type_definition_base_type(this, i, result) }
+
+  TypeConstraint getABaseType() { result = this.getBaseType(_) }
+
+  Type getASubtype() { result.getABaseType().getName() = this.getName() }
 }
diff --git a/powershell/ql/lib/semmle/code/powershell/UsingStmt.qll b/powershell/ql/lib/semmle/code/powershell/UsingStmt.qll
index 37687cee46c..2278409c0a5 100644
--- a/powershell/ql/lib/semmle/code/powershell/UsingStmt.qll
+++ b/powershell/ql/lib/semmle/code/powershell/UsingStmt.qll
@@ -4,4 +4,18 @@ class UsingStmt extends @using_statement, Stmt {
   override SourceLocation getLocation() { using_statement_location(this, result) }
 
   override string toString() { result = "using ..." }
+
+  string getName() {
+    exists(StringConstExpr const |
+      using_statement_name(this, const) and // TODO: Change dbscheme
+      result = const.getValue().getValue()
+    )
+  }
+
+  string getAlias() {
+    exists(StringConstExpr const |
+      using_statement_alias(this, const) and // TODO: Change dbscheme
+      result = const.getValue().getValue()
+    )
+  }
 }
diff --git a/powershell/ql/lib/semmle/code/powershell/Variable.qll b/powershell/ql/lib/semmle/code/powershell/Variable.qll
index 18117db52b5..f5cb7259e0e 100644
--- a/powershell/ql/lib/semmle/code/powershell/Variable.qll
+++ b/powershell/ql/lib/semmle/code/powershell/Variable.qll
@@ -53,12 +53,16 @@ private predicate isParameterImpl(string name, Scope scope) {
   name = "_"
 }
 
+private predicate isThisParameter(Scope scope, Type t) {
+  t = scope.getEnclosingFunction().getDeclaringType()
+}
+
 private newtype TParameterImpl =
   TInternalParameter(Internal::Parameter p) or
   TUnderscore(Scope scope) {
     exists(VarAccess va | va.getUserPath() = ["_", "PSItem"] and scope = va.getEnclosingScope())
   } or
-  TThisParameter(Scope scope) { exists(scope.getEnclosingFunction().getDeclaringType()) }
+  TThisParameter(Scope scope) { isThisParameter(scope, _) }
 
 private class ParameterImpl extends TParameterImpl {
   abstract Location getLocation();
@@ -88,6 +92,13 @@ private class ParameterImpl extends TParameterImpl {
   abstract predicate isPipeline();
 
   abstract predicate isPipelineByPropertyName();
+
+  /**
+   * Gets the static type of this parameter.
+   * The type of this parameter at runtime may be a subtype of this static
+   * type.
+   */
+  abstract string getStaticType();
 }
 
 private class InternalParameter extends ParameterImpl, TInternalParameter {
@@ -122,6 +133,8 @@ private class InternalParameter extends ParameterImpl, TInternalParameter {
   override predicate isPipelineByPropertyName() {
     this.getAnAttribute().getANamedArgument() instanceof ValueFromPipelineByPropertyName
   }
+
+  final override string getStaticType() { result = p.getStaticType() }
 }
 
 /**
@@ -158,6 +171,8 @@ private class Underscore extends ParameterImpl, TUnderscore {
   final override predicate isPipelineByPropertyName() { none() }
 
   final override predicate isFunctionParameter(Function f, int i) { f.getBody() = scope and i = -1 }
+
+  final override string getStaticType() { none() }
 }
 
 private class ThisParameter extends ParameterImpl, TThisParameter {
@@ -176,6 +191,13 @@ private class ThisParameter extends ParameterImpl, TThisParameter {
   final override predicate isPipeline() { none() }
 
   final override predicate isPipelineByPropertyName() { none() }
+
+  final override string getStaticType() {
+    exists(Type t |
+      isThisParameter(scope, t) and
+      result = t.getName()
+    )
+  }
 }
 
 private predicate isPipelineIteratorVariable(ParameterImpl p, ProcessBlock pb) {
@@ -251,6 +273,21 @@ class LocalVariable extends AbstractLocalScopeVariable, TLocalVariable {
   final override Scope getDeclaringScope() { result = scope }
 }
 
+/**
+ * A variable of the form `$Env:HOME`.
+ */
+class EnvVariable extends Variable {
+  string var;
+
+  EnvVariable() { this.getName() = ["env:", "Env:"] + var }
+
+  /**
+   * Gets the part of the variable name that represens which environment
+   * variable.
+   */
+  string getEnvironmentVariable() { result = var }
+}
+
 class Parameter extends AbstractLocalScopeVariable, TParameter {
   ParameterImpl p;
 
@@ -305,6 +342,8 @@ class Parameter extends AbstractLocalScopeVariable, TParameter {
   predicate isPipeline() { p.isPipeline() }
 
   predicate isPipelineByPropertyName() { p.isPipelineByPropertyName() }
+
+  string getStaticType() { result = p.getStaticType() }
 }
 
 class PipelineParameter extends Parameter {
diff --git a/powershell/ql/lib/semmle/code/powershell/VariableExpression.qll b/powershell/ql/lib/semmle/code/powershell/VariableExpression.qll
index 4259ecd79ea..b07774a2924 100644
--- a/powershell/ql/lib/semmle/code/powershell/VariableExpression.qll
+++ b/powershell/ql/lib/semmle/code/powershell/VariableExpression.qll
@@ -48,3 +48,12 @@ class VarWriteAccess extends VarAccess {
 
   predicate isImplicit() { isImplicitVariableWriteAccess(this) }
 }
+
+/** An access to an environment variable such as `$Env:PATH` */
+class EnvVarAccess extends VarAccess {
+  EnvVarAccess() { super.getVariable() instanceof EnvVariable }
+
+  override EnvVariable getVariable() { result = super.getVariable() }
+
+  string getEnvironmentVariable() { result = this.getVariable().getEnvironmentVariable() }
+}
diff --git a/powershell/ql/lib/semmle/code/powershell/controlflow/CfgNodes.qll b/powershell/ql/lib/semmle/code/powershell/controlflow/CfgNodes.qll
index f31e29ccd0b..8c8efcbb42d 100644
--- a/powershell/ql/lib/semmle/code/powershell/controlflow/CfgNodes.qll
+++ b/powershell/ql/lib/semmle/code/powershell/controlflow/CfgNodes.qll
@@ -159,6 +159,8 @@ abstract private class AbstractCallCfgNode extends AstCfgNode {
    * Gets the expression that provides the call target of this call, if any.
    */
   abstract ExprCfgNode getCommand();
+
+  int getNumberOfArguments() { result = count(this.getAnArgument()) }
 }
 
 final class CallCfgNode = AbstractCallCfgNode;
@@ -371,7 +373,7 @@ module ExprNodes {
   }
 
   class MemberChildMapping extends ExprChildMapping, MemberExpr {
-    override predicate relevantChild(Ast n) { n = this.getBase() or n = this.getMember() }
+    override predicate relevantChild(Ast n) { n = this.getQualifier() or n = this.getMember() }
   }
 
   /** A control-flow node that wraps a `MemberExpr` expression. */
@@ -382,7 +384,7 @@ module ExprNodes {
 
     final override MemberExpr getExpr() { result = super.getExpr() }
 
-    final ExprCfgNode getBase() { e.hasCfgChild(e.getBase(), this, result) }
+    final ExprCfgNode getQualifier() { e.hasCfgChild(e.getQualifier(), this, result) }
 
     final string getMemberName() { result = e.getMemberName() }
 
@@ -563,6 +565,22 @@ module ExprNodes {
 
     final ExprCfgNode getAnOperand() { e.hasCfgChild(this.getExpr().getAnOperand(), this, result) }
   }
+
+  class ExpandableStringChildMappinig extends ExprChildMapping, ExpandableStringExpr {
+    override predicate relevantChild(Ast n) { n = this.getAnExpr() }
+  }
+
+  class ExpandableStringCfgNode extends ExprCfgNode {
+    override string getAPrimaryQlClass() { result = "ExpandableStringCfgNode" }
+
+    override ExpandableStringChildMappinig e;
+
+    override ExpandableStringExpr getExpr() { result = e }
+
+    ExprCfgNode getExpr(int i) { e.hasCfgChild(e.getExpr(i), this, result) }
+
+    ExprCfgNode getAnExpr() { result = this.getExpr(_) }
+  }
 }
 
 module StmtNodes {
@@ -592,7 +610,18 @@ module StmtNodes {
 
     final override ExprCfgNode getCommand() { s.hasCfgChild(s.getCommand(), this, result) }
 
-    final override string getName() { result = s.getCmdName().getValue().getValue() }
+    final override string getName() { result = s.getCommandName() }
+
+    /** Holds if the command is qualified. */
+    predicate isQualified() { s.isQualified() }
+
+    /** Gets the namespace qualifier of this command, if any. */
+    string getNamespaceQualifier() { result = s.getNamespaceQualifier() }
+  }
+
+  /** A control-flow node that wraps a call to operator `&` */
+  class CallOperatorCfgNode extends CmdCfgNode {
+    CallOperatorCfgNode() { this.getStmt() instanceof CallOperator }
   }
 
   private class AssignStmtChildMapping extends PipelineBaseChildMapping, AssignStmt {
diff --git a/powershell/ql/lib/semmle/code/powershell/controlflow/internal/ControlFlowGraphImpl.qll b/powershell/ql/lib/semmle/code/powershell/controlflow/internal/ControlFlowGraphImpl.qll
index 3899fbe23fa..feeebe20c70 100644
--- a/powershell/ql/lib/semmle/code/powershell/controlflow/internal/ControlFlowGraphImpl.qll
+++ b/powershell/ql/lib/semmle/code/powershell/controlflow/internal/ControlFlowGraphImpl.qll
@@ -12,7 +12,6 @@ private import Completion
 private module CfgInput implements CfgShared::InputSig<Location> {
   private import ControlFlowGraphImpl as Impl
   private import Completion as Comp
-  private import Splitting as Splitting
   private import semmle.code.powershell.Cfg as Cfg
 
   class Completion = Comp::Completion;
@@ -35,10 +34,6 @@ private module CfgInput implements CfgShared::InputSig<Location> {
     scope.(Impl::CfgScope).exit(last, c)
   }
 
-  class SplitKindBase = Splitting::TSplitKind;
-
-  class Split = Splitting::Split;
-
   class SuccessorType = Cfg::SuccessorType;
 
   SuccessorType getAMatchingSuccessorType(Completion c) { result = c.getAMatchingSuccessorType() }
@@ -58,7 +53,22 @@ private module CfgInput implements CfgShared::InputSig<Location> {
 }
 
 private import CfgInput
-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>
 
 class CfgScope extends Scope {
   predicate entry(Ast first) { first(this, first) }
@@ -188,7 +198,7 @@ module Trees {
       exists(Parameter p |
         p =
           rank[i + 1](Parameter cand, int j |
-            cand.hasDefaultValue() and j = cand.getFunctionIndex()
+            cand.hasDefaultValue() and func.getFunctionParameter(j) = cand
           |
             cand order by j
           ) and
@@ -458,7 +468,7 @@ module Trees {
 
   class MemberExprTree extends StandardPostOrderTree instanceof MemberExpr {
     override AstNode getChildNode(int i) {
-      i = 0 and result = super.getBase()
+      i = 0 and result = super.getQualifier()
       or
       i = 1 and result = super.getMember()
     }
diff --git a/powershell/ql/lib/semmle/code/powershell/controlflow/internal/Splitting.qll b/powershell/ql/lib/semmle/code/powershell/controlflow/internal/Splitting.qll
index 21ca95b7077..012f284eb44 100644
--- a/powershell/ql/lib/semmle/code/powershell/controlflow/internal/Splitting.qll
+++ b/powershell/ql/lib/semmle/code/powershell/controlflow/internal/Splitting.qll
@@ -3,7 +3,8 @@
  */
 
 private import powershell
-private import Completion
+private import Completion as Comp
+private import Comp
 private import ControlFlowGraphImpl
 private import Cfg::SuccessorTypes
 private import semmle.code.powershell.controlflow.ControlFlowGraph as Cfg
@@ -11,12 +12,10 @@ private import semmle.code.powershell.controlflow.ControlFlowGraph as Cfg
 cached
 private module Cached {
   cached
-  newtype TSplitKind =
-    TConditionalCompletionSplitKind()
+  newtype TSplitKind = TConditionalCompletionSplitKind()
 
   cached
-  newtype TSplit =
-    TConditionalCompletionSplit(ConditionalCompletion c)
+  newtype TSplit = TConditionalCompletionSplit(ConditionalCompletion c)
 }
 
 import Cached
@@ -27,59 +26,57 @@ class Split extends TSplit {
   string toString() { none() }
 }
 
-private module ConditionalCompletionSplitting {
-  /**
-   * A split for conditional completions.
-   */
+module ConditionalCompletionSplitting {
   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 }
+  private class ConditionalCompletionSplitKind_ extends SplitKind, TConditionalCompletionSplitKind {
+    override int getListOrder() { result = 0 }
 
-  //   override predicate isEnabled(Ast n) { this.appliesTo(n) }
+    override predicate isEnabled(Ast n) { this.appliesTo(n) }
 
-  //   override string toString() { result = "ConditionalCompletion" }
-  // }
+    override string toString() { result = "ConditionalCompletion" }
+  }
 
-  int getNextListOrder() { result = 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(Ast pred, Ast succ, Completion c) {
-//       succ(pred, succ, c) and
-//       last(succ, _, completion) and
-//       none() // TODO
-//     }
+    bindingset[parent, parentCompletion]
+    predicate condPropagateExpr(
+      Ast parent, ConditionalCompletion parentCompletion, Ast child,
+      ConditionalCompletion childCompletion
+    ) {
+      child = parent.(NotExpr).getOperand() and
+      childCompletion.(BooleanCompletion).getDual() = parentCompletion
+      or
+      childCompletion = parentCompletion and
+      (
+        child = parent.(LogicalAndExpr).getAnOperand()
+        or
+        child = parent.(LogicalOrExpr).getAnOperand()
+        or
+        child = parent.(ConditionalExpr).getBranch(_)
+      )
+    }
 
-//     override predicate hasEntryScope(Cfg::CfgScope scope, Ast succ) { none() }
+    int getNextListOrder() { result = 1 }
 
-//     override predicate hasExit(Ast pred, Ast succ, Completion c) {
-//       this.appliesTo(pred) and
-//       succ(pred, succ, c) and
-//       if c instanceof ConditionalCompletion then completion = c else any()
-//     }
-
-//     override predicate hasExitScope(Cfg::CfgScope scope, Ast last, Completion c) {
-//       this.appliesTo(last) and
-//       succExit(scope, last, c) and
-//       if c instanceof ConditionalCompletion then completion = c else any()
-//     }
-
-//     override predicate hasSuccessor(Ast pred, Ast succ, Completion c) { none() }
-//   }
+    private class ConditionalCompletionSplitImpl extends SplitImplementations::ConditionalCompletionSplitting::ConditionalCompletionSplitImpl
+    { }
+  }
 }
 
 class ConditionalCompletionSplit = ConditionalCompletionSplitting::ConditionalCompletionSplit;
-
diff --git a/powershell/ql/lib/semmle/code/powershell/dataflow/FlowSummary.qll b/powershell/ql/lib/semmle/code/powershell/dataflow/FlowSummary.qll
new file mode 100644
index 00000000000..0f236704fef
--- /dev/null
+++ b/powershell/ql/lib/semmle/code/powershell/dataflow/FlowSummary.qll
@@ -0,0 +1,64 @@
+/** Provides classes and predicates for defining flow summaries. */
+
+import powershell
+private import semmle.code.powershell.controlflow.Cfg
+private import semmle.code.powershell.typetracking.TypeTracking
+private import semmle.code.powershell.dataflow.DataFlow
+private import internal.FlowSummaryImpl as Impl
+private import internal.DataFlowDispatch
+private import internal.DataFlowImplCommon as DataFlowImplCommon
+private import internal.DataFlowPrivate
+
+// import all instances below
+private module Summaries {
+  private import semmle.code.powershell.Frameworks
+  private import semmle.code.powershell.frameworks.data.ModelsAsData
+  import RunspaceFactory
+  import PowerShell
+  import EngineIntrinsics
+}
+
+/** A callable with a flow summary, identified by a unique string. */
+abstract class SummarizedCallable extends LibraryCallable, Impl::Public::SummarizedCallable {
+  bindingset[this]
+  SummarizedCallable() { any() }
+
+  override predicate propagatesFlow(
+    string input, string output, boolean preservesValue, string model
+  ) {
+    this.propagatesFlow(input, output, preservesValue) and model = ""
+  }
+
+  /**
+   * Holds if data may flow from `input` to `output` through this callable.
+   *
+   * `preservesValue` indicates whether this is a value-preserving step or a taint-step.
+   */
+  predicate propagatesFlow(string input, string output, boolean preservesValue) { none() }
+
+  /**
+   * Gets the synthesized parameter that results from an input specification
+   * that starts with `Argument[s]` for this library callable.
+   */
+  DataFlow::ParameterNode getParameter(string s) {
+    exists(ParameterPosition pos |
+      DataFlowImplCommon::parameterNode(result, TLibraryCallable(this), pos) and
+      s = Impl::Input::encodeParameterPosition(pos)
+    )
+  }
+}
+
+/**
+ * A callable with a flow summary, identified by a unique string, where all
+ * calls to a method with the same name are considered relevant.
+ */
+abstract class SimpleSummarizedCallable extends SummarizedCallable {
+  Call c;
+
+  bindingset[this]
+  SimpleSummarizedCallable() { c.getName() = this }
+
+  final override Call getACall() { result = c }
+
+  final override Call getACallSimple() { result = c }
+}
diff --git a/powershell/ql/lib/semmle/code/powershell/dataflow/flowsources/FlowSources.qll b/powershell/ql/lib/semmle/code/powershell/dataflow/flowsources/FlowSources.qll
new file mode 100644
index 00000000000..dc76e8bedd6
--- /dev/null
+++ b/powershell/ql/lib/semmle/code/powershell/dataflow/flowsources/FlowSources.qll
@@ -0,0 +1,18 @@
+/** Provides classes representing various flow sources for taint tracking. */
+private import semmle.code.powershell.dataflow.internal.DataFlowPublic as DataFlow
+import semmle.code.powershell.dataflow.flowsources.Remote
+import semmle.code.powershell.dataflow.flowsources.Local
+import semmle.code.powershell.frameworks.data.internal.ApiGraphModels
+
+/**
+ * A data flow source.
+ */
+abstract class SourceNode extends DataFlow::Node {
+  /**
+   * Gets a string that represents the source kind with respect to threat modeling.
+   */
+  abstract string getThreatModel();
+
+  /** Gets a string that describes the type of this flow source. */
+  abstract string getSourceType();
+}
diff --git a/powershell/ql/lib/semmle/code/powershell/dataflow/flowsources/Local.qll b/powershell/ql/lib/semmle/code/powershell/dataflow/flowsources/Local.qll
new file mode 100644
index 00000000000..b27d24a051c
--- /dev/null
+++ b/powershell/ql/lib/semmle/code/powershell/dataflow/flowsources/Local.qll
@@ -0,0 +1,93 @@
+/**
+ * Provides classes representing sources of local input.
+ */
+
+import powershell
+private import FlowSources
+
+/** A data flow source of local data. */
+abstract class LocalFlowSource extends SourceNode {
+  override string getSourceType() { result = "local flow source" }
+
+  override string getThreatModel() { result = "local" }
+}
+
+private class ExternalLocalFlowSource extends LocalFlowSource {
+  ExternalLocalFlowSource() { this = ModelOutput::getASourceNode("local", _).asSource() }
+
+  override string getSourceType() { result = "external" }
+}
+
+/** A data flow source of local user input. */
+abstract class LocalUserInputSource extends LocalFlowSource { }
+
+/**
+ * A dataflow source that represents the access of an environment variable.
+ */
+abstract class EnvironmentVariableSource extends LocalFlowSource {
+  override string getThreatModel() { result = "environment" }
+
+  override string getSourceType() { result = "environment variable" }
+}
+
+private class EnvironmentVariableEnv extends EnvironmentVariableSource {
+  EnvironmentVariableEnv() {
+    this.asExpr().getExpr().(VarReadAccess).getVariable() instanceof EnvVariable
+  }
+}
+
+private class ExternalEnvironmentVariableSource extends EnvironmentVariableSource {
+  ExternalEnvironmentVariableSource() {
+    this = ModelOutput::getASourceNode("environment", _).asSource()
+  }
+}
+
+/**
+ * A dataflow source that represents the access of a command line argument.
+ */
+abstract class CommandLineArgumentSource extends LocalFlowSource {
+  override string getThreatModel() { result = "commandargs" }
+
+  override string getSourceType() { result = "command line argument" }
+}
+
+private class ExternalCommandLineArgumentSource extends CommandLineArgumentSource {
+  ExternalCommandLineArgumentSource() {
+    this = ModelOutput::getASourceNode("command-line", _).asSource()
+  }
+}
+
+/**
+ * A data flow source that represents the parameters of the `Main` method of a program.
+ */
+private class MainMethodArgumentSource extends CommandLineArgumentSource {
+  MainMethodArgumentSource() { this.asParameter().getFunction() instanceof TopLevel }
+}
+
+/**
+ * A data flow source that represents the access of a value from the Windows registry.
+ */
+abstract class WindowsRegistrySource extends LocalFlowSource {
+  override string getThreatModel() { result = "windows-registry" }
+
+  override string getSourceType() { result = "a value from the Windows registry" }
+}
+
+private class ExternalWindowsRegistrySource extends WindowsRegistrySource {
+  ExternalWindowsRegistrySource() {
+    this = ModelOutput::getASourceNode("windows-registry", _).asSource()
+  }
+}
+
+/**
+ * A dataflow source that represents the reading from stdin.
+ */
+abstract class StdinSource extends LocalFlowSource {
+  override string getThreatModel() { result = "stdin" }
+
+  override string getSourceType() { result = "read from stdin" }
+}
+
+private class ExternalStdinSource extends StdinSource {
+  ExternalStdinSource() { this = ModelOutput::getASourceNode("stdin", _).asSource() }
+}
diff --git a/powershell/ql/lib/semmle/code/powershell/dataflow/flowsources/Remote.qll b/powershell/ql/lib/semmle/code/powershell/dataflow/flowsources/Remote.qll
new file mode 100644
index 00000000000..f6b4edd93cb
--- /dev/null
+++ b/powershell/ql/lib/semmle/code/powershell/dataflow/flowsources/Remote.qll
@@ -0,0 +1,33 @@
+/**
+ * Provides an extension point for modeling user-controlled data.
+ * Such data is often used as data-flow sources in security queries.
+ */
+
+private import semmle.code.powershell.dataflow.internal.DataFlowPublic as DataFlow
+// Need to import since frameworks can extend `RemoteFlowSource::Range`
+private import semmle.code.powershell.Frameworks
+
+/**
+ * A data flow source of remote user input.
+ *
+ * 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() }
+}
+
+/** Provides a class for modeling new sources of remote user input. */
+module RemoteFlowSource {
+  /**
+   * A data flow source of remote user input.
+   *
+   * 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();
+  }
+}
diff --git a/powershell/ql/lib/semmle/code/powershell/dataflow/internal/DataFlowDispatch.qll b/powershell/ql/lib/semmle/code/powershell/dataflow/internal/DataFlowDispatch.qll
index 9eea2e31483..4c397fbdd9a 100644
--- a/powershell/ql/lib/semmle/code/powershell/dataflow/internal/DataFlowDispatch.qll
+++ b/powershell/ql/lib/semmle/code/powershell/dataflow/internal/DataFlowDispatch.qll
@@ -3,6 +3,8 @@ private import semmle.code.powershell.Cfg
 private import DataFlowPrivate
 private import DataFlowPublic
 private import semmle.code.powershell.typetracking.internal.TypeTrackingImpl
+private import FlowSummaryImpl as FlowSummaryImpl
+private import semmle.code.powershell.dataflow.FlowSummary
 private import codeql.util.Boolean
 private import codeql.util.Unit
 
@@ -38,6 +40,15 @@ abstract class LibraryCallable extends string {
 
   /** Gets a call to this library callable. */
   Call getACall() { none() }
+
+  /** Same as `getACall()` except this does not depend on the call graph or API graph. */
+  Call getACallSimple() { none() }
+}
+
+/** A callable defined in library code, which should be taken into account in type tracking. */
+abstract class LibraryCallableToIncludeInTypeTracking extends LibraryCallable {
+  bindingset[this]
+  LibraryCallableToIncludeInTypeTracking() { exists(this) }
 }
 
 /**
@@ -108,6 +119,24 @@ abstract class DataFlowCall extends TDataFlowCall {
   }
 }
 
+class SummaryCall extends DataFlowCall, TSummaryCall {
+  private FlowSummaryImpl::Public::SummarizedCallable c;
+  private FlowSummaryImpl::Private::SummaryNode receiver;
+
+  SummaryCall() { this = TSummaryCall(c, receiver) }
+
+  /** Gets the data flow node that this call targets. */
+  FlowSummaryImpl::Private::SummaryNode getReceiver() { result = receiver }
+
+  override DataFlowCallable getEnclosingCallable() { result.asLibraryCallable() = c }
+
+  override CfgNodes::CallCfgNode asCall() { none() }
+
+  override string toString() { result = "[summary] call to " + receiver + " in " + c }
+
+  override EmptyLocation getLocation() { any() }
+}
+
 class NormalCall extends DataFlowCall, TNormalCall {
   private CfgNodes::CallCfgNode c;
 
@@ -134,6 +163,9 @@ private module TrackInstanceInput implements CallGraphConstruction::InputSig {
     or
     start.asExpr().(CfgNodes::ExprNodes::TypeNameCfgNode).getTypeName() = typename and
     exact = true
+    or
+    start.asParameter().getStaticType() = typename and
+    exact = false
   }
 
   newtype State = additional MkState(string typename, Boolean exact) { start0(_, typename, exact) }
@@ -174,12 +206,20 @@ Node trackInstance(string typename, boolean exact) {
         exact))
 }
 
+private Type getTypeWithName(string s, boolean exact) {
+  result.getName() = s and
+  exact = true
+  or
+  result.getASubtype+().getName() = s and
+  exact = false
+}
+
 private CfgScope getTargetInstance(CfgNodes::CallCfgNode call) {
   // TODO: Also match argument/parameter types
-  exists(Node receiver, string method, string typename, Type t |
+  exists(Node receiver, string method, string typename, Type t, boolean exact |
     qualifiedCall(call, receiver, method) and
-    receiver = trackInstance(typename, _) and
-    t.getName() = typename
+    receiver = trackInstance(typename, exact) and
+    t = getTypeWithName(typename, exact)
   |
     if method = "new"
     then result = t.getAConstructor().getBody()
@@ -199,6 +239,14 @@ class AdditionalCallTarget extends Unit {
   abstract DataFlowCallable viableTarget(CfgNodes::CallCfgNode call);
 }
 
+/** Holds if `call` may resolve to the returned summarized library method. */
+DataFlowCallable viableLibraryCallable(DataFlowCall call) {
+  exists(LibraryCallable callable |
+    result = TLibraryCallable(callable) and
+    call.asCall().getAstNode() = [callable.getACall(), callable.getACallSimple()]
+  )
+}
+
 cached
 private module Cached {
   cached
@@ -207,7 +255,13 @@ private module Cached {
     TLibraryCallable(LibraryCallable callable)
 
   cached
-  newtype TDataFlowCall = TNormalCall(CfgNodes::CallCfgNode c)
+  newtype TDataFlowCall =
+    TNormalCall(CfgNodes::CallCfgNode c) or
+    TSummaryCall(
+      FlowSummaryImpl::Public::SummarizedCallable c, FlowSummaryImpl::Private::SummaryNode receiver
+    ) {
+      FlowSummaryImpl::Private::summaryCallbackRange(c, receiver)
+    }
 
   /** Gets a viable run-time target for the call `call`. */
   cached
@@ -223,12 +277,18 @@ private module Cached {
   cached
   newtype TArgumentPosition =
     TThisArgumentPosition() or
-    TKeywordArgumentPosition(string name) { name = any(Argument p).getName() } or
+    TKeywordArgumentPosition(string name) {
+      name = any(Argument p).getName()
+      or
+      FlowSummaryImpl::ParsePositions::isParsedKeywordParameterPosition(_, name)
+    } or
     TPositionalArgumentPosition(int pos, NamedSet ns) {
       exists(CfgNodes::CallCfgNode call |
         call = ns.getABindingCall() and
         exists(call.getArgument(pos))
       )
+      or
+      FlowSummaryImpl::ParsePositions::isParsedParameterPosition(_, pos)
     } or
     TPipelineArgumentPosition()
 
diff --git a/powershell/ql/lib/semmle/code/powershell/dataflow/internal/DataFlowPrivate.qll b/powershell/ql/lib/semmle/code/powershell/dataflow/internal/DataFlowPrivate.qll
index 67ee749b771..1825df4bfbe 100644
--- a/powershell/ql/lib/semmle/code/powershell/dataflow/internal/DataFlowPrivate.qll
+++ b/powershell/ql/lib/semmle/code/powershell/dataflow/internal/DataFlowPrivate.qll
@@ -6,6 +6,8 @@ private import semmle.code.powershell.dataflow.Ssa
 private import DataFlowPublic
 private import DataFlowDispatch
 private import SsaImpl as SsaImpl
+private import FlowSummaryImpl as FlowSummaryImpl
+private import semmle.code.powershell.frameworks.data.ModelsAsData
 
 /** Gets the callable in which this node occurs. */
 DataFlowCallable nodeGetEnclosingCallable(Node n) { result = n.(NodeImpl).getEnclosingCallable() }
@@ -135,8 +137,25 @@ module LocalFlow {
     )
   }
 
+  predicate flowSummaryLocalStep(
+    FlowSummaryNode nodeFrom, FlowSummaryNode nodeTo, FlowSummaryImpl::Public::SummarizedCallable c,
+    string model
+  ) {
+    FlowSummaryImpl::Private::Steps::summaryLocalStep(nodeFrom.getSummaryNode(),
+      nodeTo.getSummaryNode(), true, model) and
+    c = nodeFrom.getSummarizedCallable()
+  }
+
   predicate localMustFlowStep(Node nodeFrom, Node nodeTo) {
+    SsaFlow::localMustFlowStep(_, nodeFrom, nodeTo)
+    or
     nodeFrom.asStmt() = nodeTo.asStmt().(CfgNodes::StmtNodes::AssignStmtCfgNode).getRightHandSide()
+    or
+    nodeFrom =
+      unique(FlowSummaryNode n1 |
+        FlowSummaryImpl::Private::Steps::summaryLocalStep(n1.getSummaryNode(),
+          nodeTo.(FlowSummaryNode).getSummaryNode(), true, _)
+      )
   }
 }
 
@@ -168,18 +187,27 @@ private module Cached {
       n instanceof CfgNodes::ExprNodes::QualifierCfgNode
       or
       exists(CfgNodes::ExprNodes::MemberCfgNode member |
-        n = member.getBase() and
+        n = member.getQualifier() and
         not member.isStatic()
       )
       or
       n = any(CfgNodes::ExprNodes::IndexCfgNode index).getBase()
     } or
+    TFlowSummaryNode(FlowSummaryImpl::Private::SummaryNode sn) or
     TPreReturnNodeImpl(CfgNodes::AstCfgNode n, Boolean isArray) { isMultiReturned(n) } or
     TImplicitWrapNode(CfgNodes::AstCfgNode n, Boolean shouldWrap) { isMultiReturned(n) } or
     TReturnNodeImpl(CfgScope scope) or
     TProcessNode(ProcessBlock process) or
     TProcessPropertyByNameNode(PipelineByPropertyNameIteratorVariable iter) {
       isProcessPropertyByNameNode(iter, _)
+    } or
+    TScriptBlockNode(ScriptBlock scriptBlock) or
+    TTypePathNode(int n, CfgNode cfg) { isTypePathNode(_, n, cfg) } or
+    TForbiddenRecursionGuard() {
+      none() and
+      // We want to prune irrelevant models before materialising data flow nodes, so types contributed
+      // directly from CodeQL must expose their pruning info without depending on data flow nodes.
+      (any(ModelInput::TypeModel tm).isTypeUsed("") implies any())
     }
 
   cached
@@ -197,7 +225,14 @@ private module Cached {
     (
       LocalFlow::localFlowStepCommon(nodeFrom, nodeTo)
       or
-      SsaFlow::localFlowStep(_, nodeFrom, nodeTo, _)
+      exists(SsaImpl::DefinitionExt def, boolean isUseStep |
+        SsaFlow::localFlowStep(def, nodeFrom, nodeTo, isUseStep)
+      |
+        isUseStep = false
+        or
+        isUseStep = true and
+        not FlowSummaryImpl::Private::Steps::prohibitsUseUseFlow(nodeFrom, _)
+      )
     ) and
     model = ""
   }
@@ -208,6 +243,10 @@ private module Cached {
     LocalFlow::localFlowStepCommon(nodeFrom, nodeTo)
     or
     SsaFlow::localFlowStep(_, nodeFrom, nodeTo, _)
+    or
+    // Simple flow through library code is included in the exposed local
+    // step relation, even though flow is technically inter-procedural
+    FlowSummaryImpl::Private::Steps::summaryThroughStepValue(nodeFrom, nodeTo, _)
   }
 
   /**
@@ -250,12 +289,34 @@ private module Cached {
     TypeTrackingInput::withoutContentStepImpl(_, n, _)
   }
 
+  private predicate isAutomaticVariable(Node n) {
+    n.asExpr().(CfgNodes::ExprNodes::VarReadAccessCfgNode).getVariable().getName() =
+      [
+        "args", "ConsoleFileName", "EnabledExperimentalFeatures", "Error", "Event", "EventArgs",
+        "EventSubscriber", "ExecutionContext", "HOME", "Host", "input", "IsCoreCLR", "IsLinux",
+        "IsMacOS", "IsWindows", "LASTEXITCODE", "MyInvocation", "NestedPromptLevel", "PID",
+        "PROFILE", "PSBoundParameters", "PSCmdlet", "PSCommandPath", "PSCulture", "PSDebugContext",
+        "PSEdition", "PSHOME", "PSItem", "PSScriptRoot", "PSSenderInfo", "PSUICulture",
+        "PSVersionTable", "PWD", "Sender", "ShellId", "StackTrace"
+      ]
+  }
+
   cached
   predicate isLocalSourceNode(Node n) {
     n instanceof ParameterNode
     or
+    isAutomaticVariable(n)
+    or
     // Expressions that can't be reached from another entry definition or expression
-    n instanceof ExprNode and
+    (
+      n instanceof ExprNode
+      or
+      exists(CfgNodes::StmtNodes::AssignStmtCfgNode assign | assign.getRightHandSide() = n.asStmt())
+      or
+      n.asStmt() instanceof CfgNodes::StmtNodes::CmdCfgNode
+      or
+      exists(CfgNodes::StmtNodes::PipelineCfgNode pipeline | n.asStmt() = pipeline.getAComponent())
+    ) and
     not reachedFromExprOrEntrySsaDef(n)
     or
     // Ensure all entry SSA definitions are local sources, except those that correspond
@@ -442,11 +503,20 @@ class NamedSet extends NamedSet0 {
   }
 }
 
+NamedSet emptyNamedSet() { result.isEmpty() }
+
 private module ParameterNodes {
   abstract class ParameterNodeImpl extends NodeImpl {
     abstract Parameter getParameter();
 
     abstract predicate isParameterOf(DataFlowCallable c, ParameterPosition pos);
+
+    final predicate isSourceParameterOf(CfgScope c, ParameterPosition pos) {
+      exists(DataFlowCallable callable |
+        this.isParameterOf(callable, pos) and
+        c = callable.asCfgScope()
+      )
+    }
   }
 
   /**
@@ -514,15 +584,52 @@ private module ParameterNodes {
 
     string getPropretyName() { result = this.getParameter().getName() }
   }
+
+  /** A parameter for a library callable with a flow summary. */
+  class SummaryParameterNode extends ParameterNodeImpl, FlowSummaryNode {
+    private ParameterPosition pos_;
+
+    SummaryParameterNode() {
+      FlowSummaryImpl::Private::summaryParameterNode(this.getSummaryNode(), pos_)
+    }
+
+    override Parameter getParameter() { none() }
+
+    override predicate isParameterOf(DataFlowCallable c, ParameterPosition pos) {
+      this.getSummarizedCallable() = c.asLibraryCallable() and pos = pos_
+    }
+  }
 }
 
 import ParameterNodes
 
+/** A data-flow node used to model flow summaries. */
+class FlowSummaryNode extends NodeImpl, TFlowSummaryNode {
+  FlowSummaryImpl::Private::SummaryNode getSummaryNode() { this = TFlowSummaryNode(result) }
+
+  /** Gets the summarized callable that this node belongs to. */
+  FlowSummaryImpl::Public::SummarizedCallable getSummarizedCallable() {
+    result = this.getSummaryNode().getSummarizedCallable()
+  }
+
+  override CfgScope getCfgScope() { none() }
+
+  override DataFlowCallable getEnclosingCallable() {
+    result.asLibraryCallable() = this.getSummarizedCallable()
+  }
+
+  override EmptyLocation getLocationImpl() { any() }
+
+  override string toStringImpl() { result = this.getSummaryNode().toString() }
+}
+
 /** A data-flow node that represents a call argument. */
 abstract class ArgumentNode extends Node {
   /** Holds if this argument occurs at the given position in the given call. */
   abstract predicate argumentOf(DataFlowCall call, ArgumentPosition pos);
 
+  abstract predicate sourceArgumentOf(CfgNodes::CallCfgNode call, ArgumentPosition pos);
+
   /** Gets the call in which this node is an argument. */
   final DataFlowCall getCall() { this.argumentOf(result, _) }
 }
@@ -534,13 +641,17 @@ module ArgumentNodes {
     ExplicitArgumentNode() { this.asExpr() = arg }
 
     override predicate argumentOf(DataFlowCall call, ArgumentPosition pos) {
-      arg.getCall() = call.asCall() and
+      this.sourceArgumentOf(call.asCall(), pos)
+    }
+
+    override predicate sourceArgumentOf(CfgNodes::CallCfgNode call, ArgumentPosition pos) {
+      arg.getCall() = call and
       (
         pos.isKeyword(arg.getName())
         or
         exists(NamedSet ns, int i |
           i = arg.getPosition() and
-          ns.getAnExactBindingCall() = call.asCall() and
+          ns.getAnExactBindingCall() = call and
           pos.isPositional(i, ns)
         )
         or
@@ -565,10 +676,29 @@ module ArgumentNodes {
     PipelineArgumentNode() { isPipelineInput(this.getStmtNode(), consumer) }
 
     override predicate argumentOf(DataFlowCall call, ArgumentPosition pos) {
-      call.asCall() = consumer and
+      this.sourceArgumentOf(call.asCall(), pos)
+    }
+
+    override predicate sourceArgumentOf(CfgNodes::CallCfgNode call, ArgumentPosition pos) {
+      call = consumer and
       pos.isPipeline()
     }
   }
+
+  private class SummaryArgumentNode extends FlowSummaryNode, ArgumentNode {
+    private FlowSummaryImpl::Private::SummaryNode receiver;
+    private ArgumentPosition pos_;
+
+    SummaryArgumentNode() {
+      FlowSummaryImpl::Private::summaryArgumentNode(receiver, this.getSummaryNode(), pos_)
+    }
+
+    override predicate argumentOf(DataFlowCall call, ArgumentPosition pos) {
+      call.(SummaryCall).getReceiver() = receiver and pos = pos_
+    }
+
+    override predicate sourceArgumentOf(CfgNodes::CallCfgNode call, ArgumentPosition pos) { none() }
+  }
 }
 
 import ArgumentNodes
@@ -601,6 +731,14 @@ private module EscapeContainer {
       this.getAChild().(EscapeContainer).mayBeMultiReturned(n)
     }
   }
+
+  private class SummaryReturnNode extends FlowSummaryNode, ReturnNode {
+    private ReturnKind rk;
+
+    SummaryReturnNode() { FlowSummaryImpl::Private::summaryReturnNode(this.getSummaryNode(), rk) }
+
+    override ReturnKind getKind() { result = rk }
+  }
 }
 
 private module ReturnNodes {
@@ -655,12 +793,24 @@ private module OutNodes {
       kind instanceof NormalReturnKind
     }
   }
+
+  private class SummaryOutNode extends FlowSummaryNode, OutNode {
+    private SummaryCall call;
+    private ReturnKind kind_;
+
+    SummaryOutNode() {
+      FlowSummaryImpl::Private::summaryOutNode(call.getReceiver(), this.getSummaryNode(), kind_)
+    }
+
+    override DataFlowCall getCall(ReturnKind kind) { result = call and kind = kind_ }
+  }
 }
 
 import OutNodes
 
 predicate jumpStep(Node pred, Node succ) {
-  none() // TODO
+  FlowSummaryImpl::Private::Steps::summaryJumpStep(pred.(FlowSummaryNode).getSummaryNode(),
+    succ.(FlowSummaryNode).getSummaryNode())
 }
 
 /**
@@ -669,7 +819,7 @@ predicate jumpStep(Node pred, Node succ) {
  */
 predicate storeStep(Node node1, ContentSet c, Node node2) {
   exists(CfgNodes::ExprNodes::MemberCfgWriteAccessNode var, Content::FieldContent fc |
-    node2.(PostUpdateNode).getPreUpdateNode().asExpr() = var.getBase() and
+    node2.(PostUpdateNode).getPreUpdateNode().asExpr() = var.getQualifier() and
     node1.asStmt() = var.getAssignStmt().getRightHandSide() and
     fc.getName() = var.getMemberName() and
     c.isSingleton(fc)
@@ -707,6 +857,7 @@ predicate storeStep(Node node1, ContentSet c, Node node2) {
     c.isAnyElement()
   )
   or
+  c.isAnyElement() and
   exists(
     CfgNodes::ExprNodes::ArrayExprCfgNode arrayExpr, EscapeContainer::EscapeContainer container
   |
@@ -722,11 +873,14 @@ predicate storeStep(Node node1, ContentSet c, Node node2) {
     node2.(ReturnNodeImpl).getCfgScope() = cfgNode.getScope()
   )
   or
+  c.isAnyElement() and
   exists(CfgNode cfgNode |
     node1 = TImplicitWrapNode(cfgNode, true) and
-    c.isAnyElement() and
     node2.(ReturnNodeImpl).getCfgScope() = cfgNode.getScope()
   )
+  or
+  FlowSummaryImpl::Private::Steps::summaryStoreStep(node1.(FlowSummaryNode).getSummaryNode(), c,
+    node2.(FlowSummaryNode).getSummaryNode())
 }
 
 /**
@@ -735,7 +889,7 @@ predicate storeStep(Node node1, ContentSet c, Node node2) {
 predicate readStep(Node node1, ContentSet c, Node node2) {
   exists(CfgNodes::ExprNodes::MemberCfgReadAccessNode var, Content::FieldContent fc |
     node2.asExpr() = var and
-    node1.asExpr() = var.getBase() and
+    node1.asExpr() = var.getQualifier() and
     fc.getName() = var.getMemberName() and
     c.isSingleton(fc)
   )
@@ -787,6 +941,9 @@ predicate readStep(Node node1, ContentSet c, Node node2) {
     def.getSourceVariable() = node1.(PipelineByPropertyNameParameterNode).getParameter() and
     SsaImpl::firstRead(def, node2.asExpr())
   )
+  or
+  FlowSummaryImpl::Private::Steps::summaryReadStep(node1.(FlowSummaryNode).getSummaryNode(), c,
+    node2.(FlowSummaryNode).getSummaryNode())
 }
 
 /**
@@ -795,6 +952,8 @@ predicate readStep(Node node1, ContentSet c, Node node2) {
  * in `x.f = newValue`.
  */
 predicate clearsContent(Node n, ContentSet c) {
+  FlowSummaryImpl::Private::Steps::summaryClearsContent(n.(FlowSummaryNode).getSummaryNode(), c)
+  or
   c.isSingleton(any(Content::FieldContent fc)) and
   n = any(PostUpdateNode pun | storeStep(_, c, pun)).getPreUpdateNode()
   or
@@ -807,6 +966,8 @@ predicate clearsContent(Node n, ContentSet c) {
  * at node `n`.
  */
 predicate expectsContent(Node n, ContentSet c) {
+  FlowSummaryImpl::Private::Steps::summaryExpectsContent(n.(FlowSummaryNode).getSummaryNode(), c)
+  or
   n = TPreReturnNodeImpl(_, true) and
   c.isKnownOrUnknownElement(any(Content::KnownElementContent ec | exists(ec.getIndex().asInt())))
   or
@@ -871,6 +1032,16 @@ private module PostUpdateNodes {
 
     override string toStringImpl() { result = "[post] " + e.toString() }
   }
+
+  private class SummaryPostUpdateNode extends FlowSummaryNode, PostUpdateNodeImpl {
+    private FlowSummaryNode pre;
+
+    SummaryPostUpdateNode() {
+      FlowSummaryImpl::Private::summaryPostUpdateNode(this.getSummaryNode(), pre.getSummaryNode())
+    }
+
+    override Node getPreUpdateNode() { result = pre }
+  }
 }
 
 private import PostUpdateNodes
@@ -976,6 +1147,80 @@ private class ProcessPropertyByNameNode extends TProcessPropertyByNameNode, Node
   }
 }
 
+class ScriptBlockNode extends TScriptBlockNode, NodeImpl {
+  private ScriptBlock scriptBlock;
+
+  ScriptBlockNode() { this = TScriptBlockNode(scriptBlock) }
+
+  ScriptBlock getScriptBlock() { result = scriptBlock }
+
+  override CfgScope getCfgScope() { result = scriptBlock }
+
+  override Location getLocationImpl() { result = scriptBlock.getLocation() }
+
+  override string toStringImpl() { result = scriptBlock.toString() }
+
+  override predicate nodeIsHidden() { any() }
+}
+
+private predicate isTypePathNode(string type, int n, CfgNode cfg) {
+  exists(CfgNodes::ExprNodes::TypeNameCfgNode typeName, string s |
+    cfg = typeName and
+    type = typeName.getTypeName() and
+    s = type.splitAt(".", n)
+  )
+  or
+  exists(CfgNodes::StmtNodes::CmdCfgNode cmd, string s |
+    cfg = cmd.getCommand() and
+    type = cmd.getNamespaceQualifier() and
+    s = type.splitAt(".", n)
+  )
+}
+
+/**
+ * A dataflow node that represents a component of a type or module path.
+ *
+ * For example, `System`, `System.Management`, `System.Management.Automation`,
+ * and `System.Management.Automation.PowerShell` in the type
+ * name `[System.Management.Automation.PowerShell]`.
+ */
+class TypePathNodeImpl extends TTypePathNode, NodeImpl {
+  int n;
+  CfgNode cfg;
+
+  TypePathNodeImpl() { this = TTypePathNode(n, cfg) }
+
+  string getType() { isTypePathNode(result, n, cfg) }
+
+  predicate isComplete() { not exists(this.getNext()) }
+
+  int getIndex() { result = n }
+
+  string getComponent() { result = this.getType().splitAt(".", n) }
+
+  override CfgScope getCfgScope() { result = cfg.getScope() }
+
+  override Location getLocationImpl() { result = cfg.getLocation() }
+
+  override string toStringImpl() {
+    not exists(this.getPrev()) and
+    result = this.getComponent()
+    or
+    result = this.getPrev() + "." + this.getComponent()
+  }
+
+  override predicate nodeIsHidden() { any() }
+
+  TypePathNodeImpl getNext() { result = TTypePathNode(n + 1, cfg) }
+
+  TypePathNodeImpl getPrev() { result.getNext() = this }
+
+  TypePathNodeImpl getConstant(string s) {
+    s = result.getComponent() and
+    result = this.getNext()
+  }
+}
+
 /** A node that performs a type cast. */
 class CastNode extends Node {
   CastNode() { none() }
@@ -1028,9 +1273,13 @@ predicate lambdaCall(DataFlowCall call, LambdaCallKind kind, Node receiver) {
 /** Extra data-flow steps needed for lambda flow analysis. */
 predicate additionalLambdaFlowStep(Node nodeFrom, Node nodeTo, boolean preservesValue) { none() }
 
-predicate knownSourceModel(Node source, string model) { none() }
+predicate knownSourceModel(Node source, string model) {
+  source = ModelOutput::getASourceNode(_, model).asSource()
+}
 
-predicate knownSinkModel(Node sink, string model) { none() }
+predicate knownSinkModel(Node sink, string model) {
+  sink = ModelOutput::getASinkNode(_, model).asSink()
+}
 
 class DataFlowSecondLevelScope = Unit;
 
@@ -1042,7 +1291,10 @@ class DataFlowSecondLevelScope = Unit;
  * by default as a heuristic.
  */
 predicate allowParameterReturnInSelf(ParameterNodeImpl p) {
-  none() // TODO
+  exists(DataFlowCallable c, ParameterPosition pos |
+    p.isParameterOf(c, pos) and
+    FlowSummaryImpl::Private::summaryAllowParameterReturnInSelf(c.asLibraryCallable(), pos)
+  )
 }
 
 /** An approximated `Content`. */
diff --git a/powershell/ql/lib/semmle/code/powershell/dataflow/internal/DataFlowPublic.qll b/powershell/ql/lib/semmle/code/powershell/dataflow/internal/DataFlowPublic.qll
index 7c2e37eb6ea..b8ae6a48e38 100644
--- a/powershell/ql/lib/semmle/code/powershell/dataflow/internal/DataFlowPublic.qll
+++ b/powershell/ql/lib/semmle/code/powershell/dataflow/internal/DataFlowPublic.qll
@@ -1,6 +1,8 @@
 private import powershell
 private import DataFlowDispatch
 private import DataFlowPrivate
+private import semmle.code.powershell.typetracking.internal.TypeTrackingImpl
+private import semmle.code.powershell.ApiGraphs
 private import semmle.code.powershell.Cfg
 
 /**
@@ -13,6 +15,8 @@ class Node extends TNode {
 
   CfgNodes::StmtCfgNode asStmt() { result = this.(StmtNode).getStmtNode() }
 
+  ScriptBlock asCallable() { result = this.(CallableNode).asCallableAstNode() }
+
   /** Gets the parameter corresponding to this node, if any. */
   Parameter asParameter() { result = this.(ParameterNode).getParameter() }
 
@@ -27,6 +31,12 @@ class Node extends TNode {
    */
   Node getAPredecessor() { localFlowStep(result, this) }
 
+  /**
+   * Gets a local source node from which data may flow to this node in zero or
+   * more local data-flow steps.
+   */
+  LocalSourceNode getALocalSource() { result.flowsTo(this) }
+
   /**
    * Gets a data flow node to which data may flow from this node in one local step.
    */
@@ -86,11 +96,81 @@ class ParameterNode extends Node {
   final Parameter getParameter() { result = getParameter(this) }
 }
 
+/**
+ * A data flow node corresponding to a method, block, or lambda expression.
+ */
+class CallableNode extends Node instanceof ScriptBlockNode {
+  private ParameterPosition getParameterPosition(ParameterNodeImpl node) {
+    exists(DataFlowCallable c |
+      c.asCfgScope() = this.asCallableAstNode() and
+      result = getParameterPosition(node, c)
+    )
+  }
+
+  /** Gets the underlying AST node as a `Callable`. */
+  ScriptBlock asCallableAstNode() { result = super.getScriptBlock() }
+
+  /** Gets the `n`th positional parameter. */
+  ParameterNode getParameter(int n) {
+    this.getParameterPosition(result).isPositional(n, emptyNamedSet())
+  }
+
+  /** Gets the number of positional parameters of this callable. */
+  final int getNumberOfParameters() { result = count(this.getParameter(_)) }
+
+  /** Gets the keyword parameter of the given name. */
+  ParameterNode getKeywordParameter(string name) {
+    this.getParameterPosition(result).isKeyword(name)
+  }
+
+  /**
+   * Gets a data flow node whose value is about to be returned by this callable.
+   */
+  Node getAReturnNode() { result = getAReturnNode(this.asCallableAstNode()) }
+}
+
 /**
  * A data-flow node that is a source of local flow.
  */
 class LocalSourceNode extends Node {
   LocalSourceNode() { isLocalSourceNode(this) }
+
+  /** Starts tracking this node forward using API graphs. */
+  pragma[inline]
+  API::Node track() { result = API::Internal::getNodeForForwardTracking(this) }
+
+  /** Holds if this `LocalSourceNode` can flow to `nodeTo` in one or more local flow steps. */
+  pragma[inline]
+  predicate flowsTo(Node nodeTo) { flowsTo(this, nodeTo) }
+
+  /**
+   * Gets a node that this node may flow to using one heap and/or interprocedural step.
+   *
+   * See `TypeTracker` for more details about how to use this.
+   */
+  pragma[inline]
+  LocalSourceNode track(TypeTracker t2, TypeTracker t) { t = t2.step(this, result) }
+
+  /**
+   * Gets a node that may flow into this one using one heap and/or interprocedural step.
+   *
+   * See `TypeBackTracker` for more details about how to use this.
+   */
+  pragma[inline]
+  LocalSourceNode backtrack(TypeBackTracker t2, TypeBackTracker t) { t = t2.step(result, this) }
+
+  /**
+   * Gets a node to which data may flow from this node in zero or
+   * more local data-flow steps.
+   */
+  pragma[inline]
+  Node getALocalUse() { flowsTo(this, result) }
+
+  /** Gets a method call where this node flows to the receiver. */
+  CallNode getAMethodCall() { Cached::hasMethodCall(this, result, _) }
+
+  /** Gets a call to a method named `name`, where this node flows to the receiver. */
+  CallNode getAMethodCall(string name) { Cached::hasMethodCall(this, result, name) }
 }
 
 /**
@@ -113,11 +193,35 @@ class PostUpdateNode extends Node {
   Node getPreUpdateNode() { result = pre }
 }
 
+/**
+ * A dataflow node that represents a component of a type or module path.
+ *
+ * For example, `System`, `System.Management`, `System.Management.Automation`,
+ * and `System.Management.Automation.PowerShell` in the type
+ * name `[System.Management.Automation.PowerShell]`.
+ */
+class TypePathNode extends Node instanceof TypePathNodeImpl {
+  string getComponent() { result = super.getComponent() }
+
+  TypePathNode getConstant(string s) { result = super.getConstant(s) }
+
+  API::Node track() { result = API::mod(super.getType(), super.getIndex()) }
+}
+
 cached
 private module Cached {
+  cached
+  predicate hasMethodCall(LocalSourceNode source, CallNode call, string name) {
+    source.flowsTo(call.getQualifier()) and
+    call.getName() = name
+  }
+
   cached
   CfgScope getCfgScope(NodeImpl node) { result = node.getCfgScope() }
 
+  cached
+  ReturnNode getAReturnNode(ScriptBlock scriptBlock) { getCfgScope(result) = scriptBlock }
+
   cached
   Parameter getParameter(ParameterNodeImpl param) { result = param.getParameter() }
 
@@ -126,6 +230,11 @@ private module Cached {
     param.isParameterOf(c, result)
   }
 
+  cached
+  ParameterPosition getSourceParameterPosition(ParameterNodeImpl param, ScriptBlock c) {
+    param.isSourceParameterOf(c, result)
+  }
+
   cached
   Node getPreUpdateNode(PostUpdateNodeImpl node) { result = node.getPreUpdateNode() }
 
@@ -210,6 +319,23 @@ module Content {
 
     override string toString() { result = name }
   }
+
+  /** Gets the element content corresponding to constant value `cv`. */
+  ElementContent getElementContent(ConstantValue cv) {
+    result = TKnownElementContent(cv)
+    or
+    not exists(TKnownElementContent(cv)) and
+    result = TUnknownElementContent()
+  }
+
+  /**
+   * Gets the constant value of `e`, which corresponds to a valid known
+   * element index. Unlike calling simply `e.getConstantValue()`, this
+   * excludes negative array indices.
+   */
+  ConstantValue getKnownElementIndex(Expr e) {
+    result = getElementContent(e.getValue()).(KnownElementContent).getIndex()
+  }
 }
 
 /**
@@ -321,6 +447,8 @@ class ObjectCreationNode extends Node {
   }
 
   final CfgNodes::ObjectCreationCfgNode getObjectCreationNode() { result = objectCreation }
+
+  string getConstructedTypeName() { result = this.getObjectCreationNode().getConstructedTypeName() }
 }
 
 /** A call, viewed as a node in a data flow graph. */
@@ -330,4 +458,42 @@ class CallNode extends AstNode {
   CallNode() { call = this.getCfgNode() }
 
   CfgNodes::CallCfgNode getCallNode() { result = call }
+
+  string getName() { result = call.getName() }
+
+  Node getQualifier() { result.asExpr() = call.getQualifier() }
+
+  /** Gets the i'th argument to this call. */
+  Node getArgument(int i) { result.asExpr() = call.getArgument(i) }
+
+  /** Gets the i'th positional argument to this call. */
+  Node getPositionalArgument(int i) { result.asExpr() = call.getPositionalArgument(i) }
+
+  /** Gets the argument with the name `name`, if any. */
+  Node getNamedArgument(string name) { result.asExpr() = call.getNamedArgument(name) }
+
+  /**
+   * Gets any argument of this call.
+   *
+   * Note that this predicate doesn't get the pipeline argument, if any.
+   */
+  Node getAnArgument() { result.asExpr() = call.getAnArgument() }
+
+  int getNumberOfArguments() { result = call.getNumberOfArguments() }
+}
+
+/** A call to operator `&`, viwed as a node in a data flow graph. */
+class CallOperatorNode extends CallNode {
+  override CfgNodes::StmtNodes::CallOperatorCfgNode call;
+
+  Node getCommand() { result.asExpr() = call.getCommand() }
+}
+
+/** A use of a type name, viewed as a node in a data flow graph. */
+class TypeNameNode extends ExprNode {
+  override CfgNodes::ExprNodes::TypeNameCfgNode n;
+
+  final override CfgNodes::ExprNodes::TypeNameCfgNode getExprNode() { result = n }
+
+  string getTypeName() { result = n.getTypeName() }
 }
diff --git a/powershell/ql/lib/semmle/code/powershell/dataflow/internal/FlowSummaryImpl.qll b/powershell/ql/lib/semmle/code/powershell/dataflow/internal/FlowSummaryImpl.qll
new file mode 100644
index 00000000000..e35e33c4b5e
--- /dev/null
+++ b/powershell/ql/lib/semmle/code/powershell/dataflow/internal/FlowSummaryImpl.qll
@@ -0,0 +1,232 @@
+/**
+ * Provides classes and predicates for defining flow summaries.
+ */
+
+private import codeql.dataflow.internal.FlowSummaryImpl
+private import codeql.dataflow.internal.AccessPathSyntax as AccessPath
+private import powershell
+private import semmle.code.powershell.dataflow.internal.DataFlowImplSpecific as DataFlowImplSpecific
+private import DataFlowImplSpecific::Private
+private import DataFlowImplSpecific::Public
+
+module Input implements InputSig<Location, DataFlowImplSpecific::PowershellDataFlow> {
+  class SummarizedCallableBase = string;
+
+  ArgumentPosition callbackSelfParameterPosition() { none() }
+
+  ReturnKind getStandardReturnValueKind() { result instanceof NormalReturnKind }
+
+  string encodeParameterPosition(ParameterPosition pos) {
+    exists(int i |
+      pos.isPositional(i, emptyNamedSet()) and
+      result = i.toString()
+    )
+    or
+    exists(string name |
+      pos.isKeyword(name) and
+      result = "-" + name
+    )
+    or
+    pos.isThis() and
+    result = "this"
+  }
+
+  string encodeArgumentPosition(ArgumentPosition pos) {
+    pos.isThis() and result = "this"
+    or
+    exists(int i |
+      pos.isPositional(i, emptyNamedSet()) and
+      result = i.toString()
+    )
+    or
+    exists(string name |
+      pos.isKeyword(name) and
+      result = "-" + name
+    )
+  }
+
+  string encodeContent(ContentSet cs, string arg) {
+    exists(Content c | cs = TSingletonContent(c) |
+      c = TFieldContent(arg) and result = "Field"
+      or
+      exists(ConstantValue cv |
+        c = TKnownElementContent(cv) and
+        result = "Element" and
+        arg = cv.serialize() + "!"
+      )
+      or
+      c = TUnknownElementContent() and result = "Element" and arg = "?"
+    )
+    or
+    cs = TAnyElementContent() and result = "Element" and arg = "any"
+    or
+    exists(Content::KnownElementContent kec |
+      cs = TKnownOrUnknownElementContent(kec) and
+      result = "Element" and
+      arg = kec.getIndex().serialize()
+    )
+  }
+
+  string encodeReturn(ReturnKind rk, string arg) {
+    not rk = Input::getStandardReturnValueKind() and
+    result = "ReturnValue" and
+    arg = rk.toString()
+  }
+
+  string encodeWithoutContent(ContentSet c, string arg) {
+    result = "Without" + encodeContent(c, arg)
+  }
+
+  string encodeWithContent(ContentSet c, string arg) { result = "With" + encodeContent(c, arg) }
+
+  bindingset[token]
+  ParameterPosition decodeUnknownParameterPosition(AccessPath::AccessPathTokenBase token) {
+    // needed to support `Argument[x..y]` ranges
+    token.getName() = "Argument" and
+    result.isPositional(AccessPath::parseInt(token.getAnArgument()), emptyNamedSet())
+  }
+
+  bindingset[token]
+  ArgumentPosition decodeUnknownArgumentPosition(AccessPath::AccessPathTokenBase token) {
+    // needed to support `Parameter[x..y]` ranges
+    token.getName() = "Parameter" and
+    result.isPositional(AccessPath::parseInt(token.getAnArgument()), emptyNamedSet())
+  }
+
+  bindingset[token]
+  ContentSet decodeUnknownContent(AccessPath::AccessPathTokenBase token) {
+    token.getName() = "Element" and
+    result = TSingletonContent(TUnknownElementContent())
+  }
+
+  bindingset[token]
+  ContentSet decodeUnknownWithContent(AccessPath::AccessPathTokenBase token) {
+    token.getName() = "WithElement" and
+    result = TAnyElementContent()
+  }
+}
+
+private import Make<Location, DataFlowImplSpecific::PowershellDataFlow, Input> as Impl
+
+private module StepsInput implements Impl::Private::StepsInputSig {
+  DataFlowCall getACall(Public::SummarizedCallable sc) {
+    result.asCall().getAstNode() = sc.(LibraryCallable).getACall()
+    or
+    result.asCall().getAstNode() = sc.(LibraryCallable).getACallSimple()
+  }
+}
+
+module Private {
+  import Impl::Private
+
+  module Steps = Impl::Private::Steps<StepsInput>;
+
+  /**
+   * Provides predicates for constructing summary components.
+   */
+  module SummaryComponent {
+    private import Impl::Private::SummaryComponent as SC
+
+    predicate parameter = SC::parameter/1;
+
+    predicate argument = SC::argument/1;
+
+    predicate content = SC::content/1;
+
+    predicate withoutContent = SC::withoutContent/1;
+
+    predicate withContent = SC::withContent/1;
+
+    /** Gets a summary component that represents a receiver. */
+    SummaryComponent receiver() { result = argument(any(ParameterPosition pos | pos.isThis())) }
+
+    /** Gets a summary component that represents an element in a collection at an unknown index. */
+    SummaryComponent elementUnknown() {
+      result = SC::content(TSingletonContent(TUnknownElementContent()))
+    }
+
+    /** Gets a summary component that represents an element in a collection at a known index. */
+    SummaryComponent elementKnown(ConstantValue cv) {
+      result = SC::content(TSingletonContent(Content::getElementContent(cv)))
+    }
+
+    /**
+     * Gets a summary component that represents an element in a collection at a specific
+     * known index `cv`, or an unknown index.
+     */
+    SummaryComponent elementKnownOrUnknown(ConstantValue cv) {
+      result = SC::content(TKnownOrUnknownElementContent(TKnownElementContent(cv)))
+      or
+      not exists(TKnownElementContent(cv)) and
+      result = elementUnknown()
+    }
+
+    /**
+     * Gets a summary component that represents an element in a collection at either an unknown
+     * index or known index. This has the same semantics as
+     *
+     * ```ql
+     * elementKnown() or elementUnknown(_)
+     * ```
+     *
+     * but is more efficient, because it is represented by a single value.
+     */
+    SummaryComponent elementAny() { result = SC::content(TAnyElementContent()) }
+
+    /** Gets a summary component that represents the return value of a call. */
+    SummaryComponent return() { result = SC::return(any(NormalReturnKind rk)) }
+  }
+
+  /**
+   * Provides predicates for constructing stacks of summary components.
+   */
+  module SummaryComponentStack {
+    private import Impl::Private::SummaryComponentStack as SCS
+
+    predicate singleton = SCS::singleton/1;
+
+    predicate push = SCS::push/2;
+
+    predicate argument = SCS::argument/1;
+
+    /** Gets a singleton stack representing a receiver. */
+    SummaryComponentStack receiver() { result = singleton(SummaryComponent::receiver()) }
+
+    /** Gets a singleton stack representing the return value of a call. */
+    SummaryComponentStack return() { result = singleton(SummaryComponent::return()) }
+  }
+}
+
+module Public = Impl::Public;
+
+module ParsePositions {
+  private import Private
+
+  private predicate isParamBody(string body) {
+    body = any(AccessPathToken tok).getAnArgument("Parameter")
+  }
+
+  private predicate isArgBody(string body) {
+    body = any(AccessPathToken tok).getAnArgument("Argument")
+  }
+
+  predicate isParsedParameterPosition(string c, int i) {
+    isParamBody(c) and
+    i = AccessPath::parseInt(c)
+  }
+
+  predicate isParsedArgumentPosition(string c, int i) {
+    isArgBody(c) and
+    i = AccessPath::parseInt(c)
+  }
+
+  predicate isParsedKeywordParameterPosition(string c, string paramName) {
+    isParamBody(c) and
+    c = paramName + ":"
+  }
+
+  predicate isParsedKeywordArgumentPosition(string c, string paramName) {
+    isArgBody(c) and
+    c = paramName + ":"
+  }
+}
diff --git a/powershell/ql/lib/semmle/code/powershell/dataflow/internal/TaintTrackingPrivate.qll b/powershell/ql/lib/semmle/code/powershell/dataflow/internal/TaintTrackingPrivate.qll
index 33b40ea7f96..8cc0f0a8722 100644
--- a/powershell/ql/lib/semmle/code/powershell/dataflow/internal/TaintTrackingPrivate.qll
+++ b/powershell/ql/lib/semmle/code/powershell/dataflow/internal/TaintTrackingPrivate.qll
@@ -34,11 +34,18 @@ private module Cached {
   cached
   predicate defaultAdditionalTaintStep(DataFlow::Node nodeFrom, DataFlow::Node nodeTo, string model) {
     (
+      // Flow from an operand to an operation
       exists(CfgNodes::ExprNodes::OperationCfgNode op |
         op = nodeTo.asExpr() and
         op.getAnOperand() = nodeFrom.asExpr()
       )
       or
+      // Flow through string interpolation
+      exists(CfgNodes::ExprNodes::ExpandableStringCfgNode es |
+        nodeFrom.asExpr() = es.getAnExpr() and
+        nodeTo.asExpr() = es
+      )
+      or
       // Although flow through collections is modeled precisely using stores/reads, we still
       // allow flow out of a _tainted_ collection. This is needed in order to support taint-
       // tracking configurations where the source is a collection.
@@ -65,3 +72,15 @@ private module Cached {
 }
 
 import Cached
+import SpeculativeTaintFlow
+
+private module SpeculativeTaintFlow {
+  private import semmle.code.powershell.dataflow.internal.DataFlowDispatch as DataFlowDispatch
+  private import semmle.code.powershell.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) { none() }
+}
diff --git a/powershell/ql/lib/semmle/code/powershell/frameworks/MicrosoftPowershellUtility/model.yml b/powershell/ql/lib/semmle/code/powershell/frameworks/MicrosoftPowershellUtility/model.yml
new file mode 100644
index 00000000000..bd653b0d327
--- /dev/null
+++ b/powershell/ql/lib/semmle/code/powershell/frameworks/MicrosoftPowershellUtility/model.yml
@@ -0,0 +1,6 @@
+extensions:
+  - addsTo:
+      pack: microsoft-sdl/powershell-all
+      extensible: sourceModel
+    data:
+      - ["Microsoft.PowerShell.Utility!", "Method[Read-Host].ReturnValue", "stdin"]
diff --git a/powershell/ql/lib/semmle/code/powershell/frameworks/MicrosoftWin32Registry/model.yml b/powershell/ql/lib/semmle/code/powershell/frameworks/MicrosoftWin32Registry/model.yml
new file mode 100644
index 00000000000..edbe11bbaa1
--- /dev/null
+++ b/powershell/ql/lib/semmle/code/powershell/frameworks/MicrosoftWin32Registry/model.yml
@@ -0,0 +1,6 @@
+extensions:
+  - addsTo:
+      pack: microsoft-sdl/powershell-all
+      extensible: sourceModel
+    data:
+      - ["Microsoft.Win32.Registry!", "Method[GetValue]", "windows-registry"]
\ No newline at end of file
diff --git a/powershell/ql/lib/semmle/code/powershell/frameworks/MicrosoftWin32RegistryKey/model.yml b/powershell/ql/lib/semmle/code/powershell/frameworks/MicrosoftWin32RegistryKey/model.yml
new file mode 100644
index 00000000000..b0b6a91b1b3
--- /dev/null
+++ b/powershell/ql/lib/semmle/code/powershell/frameworks/MicrosoftWin32RegistryKey/model.yml
@@ -0,0 +1,8 @@
+extensions:
+  - addsTo:
+      pack: microsoft-sdl/powershell-all
+      extensible: sourceModel
+    data:
+      - ["Microsoft.Win32.RegistryKey", "Method[GetValue].ReturnValue", "windows-registry"]
+      - ["Microsoft.Win32.RegistryKey", "Method[GetValueNames].ReturnValue", "windows-registry"]
+      - ["Microsoft.Win32.RegistryKey", "Method[GetSubKeyNames].ReturnValue", "windows-registry"]
\ No newline at end of file
diff --git a/powershell/ql/lib/semmle/code/powershell/frameworks/SystemConsole/model.yml b/powershell/ql/lib/semmle/code/powershell/frameworks/SystemConsole/model.yml
new file mode 100644
index 00000000000..afc66e43f9f
--- /dev/null
+++ b/powershell/ql/lib/semmle/code/powershell/frameworks/SystemConsole/model.yml
@@ -0,0 +1,8 @@
+extensions:
+  - addsTo:
+      pack: microsoft-sdl/powershell-all
+      extensible: sourceModel
+    data:
+      - ["System.Console", "Method[Read].ReturnValue", "stdin"]
+      - ["System.Console", "Method[ReadKey].ReturnValue", "stdin"]
+      - ["System.Console", "Method[ReadLine].ReturnValue", "stdin"]
\ No newline at end of file
diff --git a/powershell/ql/lib/semmle/code/powershell/frameworks/SystemEnvironment/model.yml b/powershell/ql/lib/semmle/code/powershell/frameworks/SystemEnvironment/model.yml
new file mode 100644
index 00000000000..c85e710be62
--- /dev/null
+++ b/powershell/ql/lib/semmle/code/powershell/frameworks/SystemEnvironment/model.yml
@@ -0,0 +1,9 @@
+extensions:
+  - addsTo:
+      pack: microsoft-sdl/powershell-all
+      extensible: sourceModel
+    data:
+      - ["System.Environment!", "Method[ExpandEnvironmentVariables].ReturnValue", "environment"]
+      - ["System.Environment!", "Method[GetCommandLineArgs].ReturnValue", "commandargs"]
+      - ["System.Environment!", "Method[GetEnvironmentVariable].ReturnValue", "environment"]
+      - ["System.Environment!", "Method[GetEnvironmentVariables].ReturnValue", "environment"]
\ No newline at end of file
diff --git a/powershell/ql/lib/semmle/code/powershell/frameworks/SystemIOFile/model.yml b/powershell/ql/lib/semmle/code/powershell/frameworks/SystemIOFile/model.yml
new file mode 100644
index 00000000000..87a270fc29e
--- /dev/null
+++ b/powershell/ql/lib/semmle/code/powershell/frameworks/SystemIOFile/model.yml
@@ -0,0 +1,21 @@
+extensions:
+  - addsTo:
+      pack: microsoft-sdl/powershell-all
+      extensible: sourceModel
+    data:
+      - ["System.IO.File!", "Method[AppendText].ReturnValue", "file-write"]
+      - ["System.IO.File!", "Method[Create].ReturnValue", "file-write"]
+      - ["System.IO.File!", "Method[CreateText].ReturnValue", "file-write"]
+      - ["System.IO.File!", "Method[Open].ReturnValue", "file-write"]
+      - ["System.IO.File!", "Method[Open].ReturnValue", "file"]
+      - ["System.IO.File!", "Method[OpenRead].ReturnValue", "file"]
+      - ["System.IO.File!", "Method[OpenText].ReturnValue", "file"]
+      - ["System.IO.File!", "Method[OpenWrite].ReturnValue", "file-write"]
+      - ["System.IO.File!", "Method[ReadAllBytes].ReturnValue", "file"]
+      - ["System.IO.File!", "Method[ReadAllBytesAsync].ReturnValue", "file"]
+      - ["System.IO.File!", "Method[ReadAllLines].ReturnValue", "file"]
+      - ["System.IO.File!", "Method[ReadAllLinesAsync].ReturnValue", "file"]
+      - ["System.IO.File!", "Method[ReadAllText].ReturnValue", "file"]
+      - ["System.IO.File!", "Method[ReadAllTextAsync].ReturnValue", "file"]
+      - ["System.IO.File!", "Method[ReadLines].ReturnValue", "file"]
+      - ["System.IO.File!", "Method[ReadLinesAsync].ReturnValue", "file"]
\ No newline at end of file
diff --git a/powershell/ql/lib/semmle/code/powershell/frameworks/SystemIOFileInfo/model.yml b/powershell/ql/lib/semmle/code/powershell/frameworks/SystemIOFileInfo/model.yml
new file mode 100644
index 00000000000..82406744f09
--- /dev/null
+++ b/powershell/ql/lib/semmle/code/powershell/frameworks/SystemIOFileInfo/model.yml
@@ -0,0 +1,13 @@
+extensions:
+  - addsTo:
+      pack: microsoft-sdl/powershell-all
+      extensible: sourceModel
+    data:
+      - ["System.IO.FileInfo!", "Method[AppendText].ReturnValue", "file-write"]
+      - ["System.IO.FileInfo!", "Method[Create].ReturnValue", "file-write"]
+      - ["System.IO.FileInfo!", "Method[CreateText].ReturnValue", "file-write"]
+      - ["System.IO.FileInfo!", "Method[Open].ReturnValue", "file-write"]
+      - ["System.IO.FileInfo!", "Method[Open].ReturnValue", "file"]
+      - ["System.IO.FileInfo!", "Method[OpenRead].ReturnValue", "file"]
+      - ["System.IO.FileInfo!", "Method[OpenText].ReturnValue", "file"]
+      - ["System.IO.FileInfo!", "Method[OpenWrite].ReturnValue", "file-write"]
diff --git a/powershell/ql/lib/semmle/code/powershell/frameworks/SystemIOFileStream/model.yml b/powershell/ql/lib/semmle/code/powershell/frameworks/SystemIOFileStream/model.yml
new file mode 100644
index 00000000000..7d1fc1d93b2
--- /dev/null
+++ b/powershell/ql/lib/semmle/code/powershell/frameworks/SystemIOFileStream/model.yml
@@ -0,0 +1,7 @@
+extensions:
+  - addsTo:
+      pack: microsoft-sdl/powershell-all
+      extensible: sourceModel
+    data:
+      - ["System.IO.FileStream", "Instance", "file"]
+      - ["System.IO.FileStream", "Instance", "file-write"]
\ No newline at end of file
diff --git a/powershell/ql/lib/semmle/code/powershell/frameworks/SystemIOStreamWriter/model.yml b/powershell/ql/lib/semmle/code/powershell/frameworks/SystemIOStreamWriter/model.yml
new file mode 100644
index 00000000000..20524b44d61
--- /dev/null
+++ b/powershell/ql/lib/semmle/code/powershell/frameworks/SystemIOStreamWriter/model.yml
@@ -0,0 +1,6 @@
+extensions:
+  - addsTo:
+      pack: microsoft-sdl/powershell-all
+      extensible: sourceModel
+    data:
+      - ["System.IO.StreamWriter", "Instance", "file-write"]
\ No newline at end of file
diff --git a/powershell/ql/lib/semmle/code/powershell/frameworks/SystemManagementAutomationEngineIntrinsics/EngineIntrinsics.qll b/powershell/ql/lib/semmle/code/powershell/frameworks/SystemManagementAutomationEngineIntrinsics/EngineIntrinsics.qll
new file mode 100644
index 00000000000..9f856f28949
--- /dev/null
+++ b/powershell/ql/lib/semmle/code/powershell/frameworks/SystemManagementAutomationEngineIntrinsics/EngineIntrinsics.qll
@@ -0,0 +1,12 @@
+import powershell
+import semmle.code.powershell.frameworks.data.internal.ApiGraphModels
+private import semmle.code.powershell.dataflow.internal.DataFlowPublic as DataFlow
+
+module EngineIntrinsics {
+  private class EngineIntrinsicsGlobalEntry extends ModelInput::TypeModel {
+    override DataFlow::Node getASource(string type) {
+      type = "System.Management.Automation.EngineIntrinsics" and
+      result.asExpr().getExpr().(VarReadAccess).getUserPath().toLowerCase() = "executioncontext"
+    }
+  }
+}
diff --git a/powershell/ql/lib/semmle/code/powershell/frameworks/SystemManagementAutomationEngineIntrinsics/model.yml b/powershell/ql/lib/semmle/code/powershell/frameworks/SystemManagementAutomationEngineIntrinsics/model.yml
new file mode 100644
index 00000000000..6364b97ab82
--- /dev/null
+++ b/powershell/ql/lib/semmle/code/powershell/frameworks/SystemManagementAutomationEngineIntrinsics/model.yml
@@ -0,0 +1,12 @@
+extensions:
+  - addsTo:
+      pack: microsoft-sdl/powershell-all
+      extensible: sinkModel
+    data:
+      - ["System.Management.Automation.CommandInvocationIntrinsics", "Method[ExpandString].Argument[0]", "command-injection"]
+
+  - addsTo:
+      pack: microsoft-sdl/powershell-all
+      extensible: typeModel
+    data:
+    - ["System.Management.Automation.CommandInvocationIntrinsics","System.Management.Automation.EngineIntrinsics","Member[InvokeCommand]"]
\ No newline at end of file
diff --git a/powershell/ql/lib/semmle/code/powershell/frameworks/SystemManagementAutomationPowerShell/PowerShell.qll b/powershell/ql/lib/semmle/code/powershell/frameworks/SystemManagementAutomationPowerShell/PowerShell.qll
new file mode 100644
index 00000000000..a3b606cb9ed
--- /dev/null
+++ b/powershell/ql/lib/semmle/code/powershell/frameworks/SystemManagementAutomationPowerShell/PowerShell.qll
@@ -0,0 +1,12 @@
+import powershell
+import semmle.code.powershell.frameworks.data.internal.ApiGraphModels
+private import semmle.code.powershell.dataflow.internal.DataFlowPublic as DataFlow
+
+module PowerShell {
+  private class PowerShellGlobalEntry extends ModelInput::TypeModel {
+    override DataFlow::Node getASource(string type) {
+      type = "System.Management.Automation.PowerShell!" and
+      result.asExpr().getExpr().(TypeNameExpr).getName().toLowerCase() = "powershell"
+    }
+  }
+}
diff --git a/powershell/ql/lib/semmle/code/powershell/frameworks/SystemManagementAutomationPowerShell/model.yml b/powershell/ql/lib/semmle/code/powershell/frameworks/SystemManagementAutomationPowerShell/model.yml
new file mode 100644
index 00000000000..ca3e8b546cb
--- /dev/null
+++ b/powershell/ql/lib/semmle/code/powershell/frameworks/SystemManagementAutomationPowerShell/model.yml
@@ -0,0 +1,13 @@
+extensions:
+  - addsTo:
+      pack: microsoft-sdl/powershell-all
+      extensible: sinkModel
+    data:
+      - ["System.Management.Automation.PowerShell", "Method[AddScript].Argument[0]", "command-injection"]
+      - ["System.Management.Automation.ScriptBlock!", "Method[Create].Argument[0]", "command-injection"]
+
+  - addsTo:
+      pack: microsoft-sdl/powershell-all
+      extensible: typeModel
+    data:
+    - ["System.Management.Automation.PowerShell","System.Management.Automation.PowerShell!","Method[Create].ReturnValue"]
\ No newline at end of file
diff --git a/powershell/ql/lib/semmle/code/powershell/frameworks/SystemManagementAutomationRunspaces/Runspaces.qll b/powershell/ql/lib/semmle/code/powershell/frameworks/SystemManagementAutomationRunspaces/Runspaces.qll
new file mode 100644
index 00000000000..fd4e6e9c6f3
--- /dev/null
+++ b/powershell/ql/lib/semmle/code/powershell/frameworks/SystemManagementAutomationRunspaces/Runspaces.qll
@@ -0,0 +1,12 @@
+import powershell
+import semmle.code.powershell.frameworks.data.internal.ApiGraphModels
+private import semmle.code.powershell.dataflow.internal.DataFlowPublic as DataFlow
+
+module RunspaceFactory {
+  private class RunspaceFactoryGlobalEntry extends ModelInput::TypeModel {
+    override DataFlow::Node getASource(string type) {
+      type = "System.Management.Automation.Runspaces.RunspaceFactory!" and
+      result.asExpr().getExpr().(TypeNameExpr).getName().toLowerCase() = "runspacefactory"
+    }
+  }
+}
diff --git a/powershell/ql/lib/semmle/code/powershell/frameworks/SystemManagementAutomationRunspaces/model.yml b/powershell/ql/lib/semmle/code/powershell/frameworks/SystemManagementAutomationRunspaces/model.yml
new file mode 100644
index 00000000000..721d41c3d64
--- /dev/null
+++ b/powershell/ql/lib/semmle/code/powershell/frameworks/SystemManagementAutomationRunspaces/model.yml
@@ -0,0 +1,13 @@
+extensions:
+  - addsTo:
+      pack: microsoft-sdl/powershell-all
+      extensible: sinkModel
+    data:
+      - ["System.Management.Automation.Runspaces.Runspace", "Method[CreateNestedPipeline].Argument[0]", "command-injection"]
+      - ["System.Management.Automation.Runspaces.Runspace", "Method[CreatePipeline].Argument[0]", "command-injection"]
+
+  - addsTo:
+      pack: microsoft-sdl/powershell-all
+      extensible: typeModel
+    data:
+    - ["System.Management.Automation.Runspaces.Runspace","System.Management.Automation.Runspaces.RunspaceFactory!","Method[CreateRunspace].ReturnValue"]
\ No newline at end of file
diff --git a/powershell/ql/lib/semmle/code/powershell/frameworks/SystemManagementAutomationScriptBlock/model.yml b/powershell/ql/lib/semmle/code/powershell/frameworks/SystemManagementAutomationScriptBlock/model.yml
new file mode 100644
index 00000000000..df9abac9d24
--- /dev/null
+++ b/powershell/ql/lib/semmle/code/powershell/frameworks/SystemManagementAutomationScriptBlock/model.yml
@@ -0,0 +1,6 @@
+extensions:
+  - addsTo:
+      pack: microsoft-sdl/powershell-all
+      extensible: sinkModel
+    data:
+      - ["System.Management.Automation.ScriptBlock!", "Method[Create].Argument[0]", "command-injection"]
diff --git a/powershell/ql/lib/semmle/code/powershell/frameworks/SystemNetSockets/model.yml b/powershell/ql/lib/semmle/code/powershell/frameworks/SystemNetSockets/model.yml
new file mode 100644
index 00000000000..572a8872a61
--- /dev/null
+++ b/powershell/ql/lib/semmle/code/powershell/frameworks/SystemNetSockets/model.yml
@@ -0,0 +1,9 @@
+extensions:
+  - addsTo:
+      pack: microsoft-sdl/powershell-all
+      extensible: sourceModel
+    data:
+      - ["System.Net.Sockets.TcpClient", "Method[GetStream].ReturnValue", "remote"]
+      - ["System.Net.Sockets.UpdClient", "Method[EndReceive].ReturnValue", "remote"]
+      - ["System.Net.Sockets.UpdClient", "Method[Receive].ReturnValue", "remote"]
+      - ["System.Net.Sockets.UpdClient", "Method[ReceiveAsync].ReturnValue", "remote"]
\ No newline at end of file
diff --git a/powershell/ql/lib/semmle/code/powershell/frameworks/data/ModelsAsData.qll b/powershell/ql/lib/semmle/code/powershell/frameworks/data/ModelsAsData.qll
new file mode 100644
index 00000000000..ddacb7b2d25
--- /dev/null
+++ b/powershell/ql/lib/semmle/code/powershell/frameworks/data/ModelsAsData.qll
@@ -0,0 +1,51 @@
+/**
+ * Provides classes for contributing a model, or using the interpreted results
+ * of a model represented as data.
+ */
+
+private import powershell
+private import semmle.code.powershell.ApiGraphs
+private import internal.ApiGraphModels as Shared
+private import internal.ApiGraphModelsSpecific as Specific
+import Shared::ModelInput as ModelInput
+import Shared::ModelOutput as ModelOutput
+private import semmle.code.powershell.dataflow.flowsources.FlowSources
+private import semmle.code.powershell.dataflow.FlowSummary
+
+/**
+ * A remote flow source originating from a CSV source row.
+ */
+private class RemoteFlowSourceFromCsv extends RemoteFlowSource::Range {
+  RemoteFlowSourceFromCsv() { this = ModelOutput::getASourceNode("remote").asSource() }
+
+  override string getSourceType() { result = "Remote flow (from model)" }
+}
+
+private class SummarizedCallableFromModel extends SummarizedCallable {
+  string type;
+  string path;
+
+  SummarizedCallableFromModel() {
+    ModelOutput::relevantSummaryModel(type, path, _, _, _, _) and
+    this = type + ";" + path
+  }
+
+  override Call getACall() {
+    exists(API::MethodAccessNode base |
+      ModelOutput::resolvedSummaryBase(type, path, base) and
+      result = base.asCall().asExpr().getExpr()
+    )
+  }
+
+  override predicate propagatesFlow(
+    string input, string output, boolean preservesValue, string model
+  ) {
+    exists(string kind | ModelOutput::relevantSummaryModel(type, path, input, output, kind, model) |
+      kind = "value" and
+      preservesValue = true
+      or
+      kind = "taint" and
+      preservesValue = false
+    )
+  }
+}
diff --git a/powershell/ql/lib/semmle/code/powershell/frameworks/data/empty.model.yml b/powershell/ql/lib/semmle/code/powershell/frameworks/data/empty.model.yml
new file mode 100644
index 00000000000..63cc261eb30
--- /dev/null
+++ b/powershell/ql/lib/semmle/code/powershell/frameworks/data/empty.model.yml
@@ -0,0 +1,32 @@
+extensions:
+  # Make sure that the extensible model predicates have at least one definition
+  # to avoid errors about undefined extensionals.
+  - addsTo:
+      pack: microsoft-sdl/powershell-all
+      extensible: sourceModel
+    data: []
+
+  - addsTo:
+      pack: microsoft-sdl/powershell-all
+      extensible: sinkModel
+    data: []
+
+  - addsTo:
+      pack: microsoft-sdl/powershell-all
+      extensible: summaryModel
+    data: []
+
+  - addsTo:
+      pack: microsoft-sdl/powershell-all
+      extensible: neutralModel
+    data: []
+
+  - addsTo:
+      pack: microsoft-sdl/powershell-all
+      extensible: typeModel
+    data: []
+
+  - addsTo:
+      pack: microsoft-sdl/powershell-all
+      extensible: typeVariableModel
+    data: []
diff --git a/powershell/ql/lib/semmle/code/powershell/frameworks/data/internal/ApiGraphModels.qll b/powershell/ql/lib/semmle/code/powershell/frameworks/data/internal/ApiGraphModels.qll
new file mode 100644
index 00000000000..aec65d1819c
--- /dev/null
+++ b/powershell/ql/lib/semmle/code/powershell/frameworks/data/internal/ApiGraphModels.qll
@@ -0,0 +1,634 @@
+/**
+ * INTERNAL use only. This is an experimental API subject to change without notice.
+ *
+ * Provides classes and predicates for dealing with flow models specified in extensible predicates.
+ *
+ * The extensible predicates have the following columns:
+ * - Sources:
+ *   `type, path, kind`
+ * - Sinks:
+ *   `type, path, kind`
+ * - Summaries:
+ *   `type, path, input, output, kind`
+ * - Types:
+ *   `type1, type2, path`
+ *
+ * The interpretation of a row is similar to API-graphs with a left-to-right
+ * reading.
+ * 1. The `type` column selects all instances of a named type. The syntax of this column is language-specific.
+ *    The language defines some type names that the analysis knows how to identify without models.
+ *    It can also be a synthetic type name defined by a type definition (see type definitions below).
+ * 2. The `path` column is a `.`-separated list of "access path tokens" to resolve, starting at the node selected by `type`.
+ *
+ *    Every language supports the following tokens:
+ *     - Argument[n]: the n-th argument to a call. May be a range of form `x..y` (inclusive) and/or a comma-separated list.
+ *                    Additionally, `N-1` refers to the last argument, `N-2` refers to the second-last, and so on.
+ *     - Parameter[n]: the n-th parameter of a callback. May be a range of form `x..y` (inclusive) and/or a comma-separated list.
+ *     - ReturnValue: the value returned by a function call
+ *     - WithArity[n]: match a call with the given arity. May be a range of form `x..y` (inclusive) and/or a comma-separated list.
+ *
+ *    The following tokens are common and should be implemented for languages where it makes sense:
+ *     - Member[x]: a member named `x`; exactly what a "member" is depends on the language. May be a comma-separated list of names.
+ *     - Instance: an instance of a class
+ *     - Subclass: a subclass of a class
+ *     - ArrayElement: an element of array
+ *     - Element: an element of a collection-like object
+ *     - MapKey: a key in map-like object
+ *     - MapValue: a value in a map-like object
+ *     - Awaited: the value from a resolved promise/future-like object
+ *
+ *    For the time being, please consult `ApiGraphModelsSpecific.qll` to see which language-specific tokens are currently supported.
+ *
+ * 3. The `input` and `output` columns specify how data enters and leaves the element selected by the
+ *    first `(type, path)` tuple. Both strings are `.`-separated access paths
+ *    of the same syntax as the `path` column.
+ * 4. The `kind` column is a tag that can be referenced from QL to determine to
+ *    which classes the interpreted elements should be added. For example, for
+ *    sources `"remote"` indicates a default remote flow source, and for summaries
+ *    `"taint"` indicates a default additional taint step and `"value"` indicates a
+ *    globally applicable value-preserving step.
+ *
+ * ### Types
+ *
+ * A type row of form `type1; type2; path` indicates that `type2; path`
+ * should be seen as an instance of the type `type1`.
+ *
+ * A type may refer to a static type or a synthetic type name used internally in the model.
+ * Synthetic type names can be used to reuse intermediate sub-paths, when there are multiple ways to access the same
+ * element.
+ * See `ModelsAsData.qll` for the language-specific interpretation of type names.
+ *
+ * By convention, if one wants to avoid clashes with static types, the type name
+ * should be prefixed with a tilde character (`~`). For example, `~Bar` can be used to indicate that
+ * the type is not intended to match a static type.
+ */
+
+private import codeql.util.Unit
+private import ApiGraphModelsSpecific as Specific
+
+private module API = Specific::API;
+
+private module DataFlow = Specific::DataFlow;
+
+private import semmle.code.powershell.controlflow.CfgNodes
+private import ApiGraphModelsExtensions as Extensions
+private import codeql.dataflow.internal.AccessPathSyntax
+
+/** Module containing hooks for providing input data to be interpreted as a model. */
+module ModelInput {
+  /**
+   * A unit class for adding additional type model rows from CodeQL models.
+   */
+  class TypeModel extends Unit {
+    /**
+     * Holds if any of the other predicates in this class might have a result
+     * for the given `type`.
+     *
+     * The implementation of this predicate should not depend on `DataFlow::Node`.
+     */
+    bindingset[type]
+    predicate isTypeUsed(string type) { none() }
+
+    /**
+     * Gets a data-flow node that is a source of the given `type`.
+     *
+     * Note that `type` should also be included in `isTypeUsed`.
+     *
+     * This must not depend on API graphs, but ensures that an API node is generated for
+     * the source.
+     */
+    DataFlow::Node getASource(string type) { none() }
+
+    /**
+     * Gets a data-flow node that is a sink of the given `type`,
+     * usually because it is an argument passed to a parameter of that type.
+     *
+     * Note that `type` should also be included in `isTypeUsed`.
+     *
+     * This must not depend on API graphs, but ensures that an API node is generated for
+     * the sink.
+     */
+    DataFlow::Node getASink(string type) { none() }
+
+    /**
+     * Gets an API node that is a source or sink of the given `type`.
+     *
+     * Note that `type` should also be included in `isTypeUsed`.
+     *
+     * Unlike `getASource` and `getASink`, this may depend on API graphs.
+     */
+    API::Node getAnApiNode(string type) { none() }
+  }
+}
+
+private import ModelInput
+
+/**
+ * An empty class, except in specific tests.
+ *
+ * If this is non-empty, all models are parsed even if the type name is not
+ * considered relevant for the current database.
+ */
+abstract class TestAllModels extends Unit { }
+
+/** Holds if a source model exists for the given parameters. */
+predicate sourceModel(string type, string path, string kind, string model) {
+  exists(QlBuiltins::ExtensionId madId |
+    Extensions::sourceModel(type, path, kind, madId) and
+    model = "MaD:" + madId.toString()
+  )
+}
+
+/** Holds if a sink model exists for the given parameters. */
+private predicate sinkModel(string type, string path, string kind, string model) {
+  exists(QlBuiltins::ExtensionId madId |
+    Extensions::sinkModel(type, path, kind, madId) and
+    model = "MaD:" + madId.toString()
+  )
+}
+
+/** Holds if a summary model `row` exists for the given parameters. */
+private predicate summaryModel(
+  string type, string path, string input, string output, string kind, string model
+) {
+  exists(QlBuiltins::ExtensionId madId |
+    Extensions::summaryModel(type, path, input, output, kind, madId) and
+    model = "MaD:" + madId.toString()
+  )
+}
+
+/** Holds if `(type2, path)` should be seen as an instance of `type1`. */
+predicate typeModel(string type1, string type2, string path) {
+  Extensions::typeModel(type1, type2, path)
+}
+
+/** Holds if a type variable model exists for the given parameters. */
+private predicate typeVariableModel(string name, string path) {
+  Extensions::typeVariableModel(name, path)
+}
+
+/**
+ * Holds if the given extension tuple `madId` should pretty-print as `model`.
+ *
+ * This predicate should only be used in tests.
+ */
+predicate interpretModelForTest(QlBuiltins::ExtensionId madId, string model) {
+  exists(string type, string path, string kind |
+    Extensions::sourceModel(type, path, kind, madId) and
+    model = "Source: " + type + "; " + path + "; " + kind
+  )
+  or
+  exists(string type, string path, string kind |
+    Extensions::sinkModel(type, path, kind, madId) and
+    model = "Sink: " + type + "; " + path + "; " + kind
+  )
+  or
+  exists(string type, string path, string input, string output, string kind |
+    Extensions::summaryModel(type, path, input, output, kind, madId) and
+    model = "Summary: " + type + "; " + path + "; " + input + "; " + output + "; " + kind
+  )
+}
+
+/**
+ * Holds if rows involving `type` might be relevant for the analysis of this database.
+ */
+predicate isRelevantType(string type) {
+  (
+    sourceModel(type, _, _, _) or
+    sinkModel(type, _, _, _) or
+    summaryModel(type, _, _, _, _, _) or
+    typeModel(_, type, _)
+  ) and
+  (
+    Specific::isTypeUsed(type)
+    or
+    any(TypeModel model).isTypeUsed(type)
+    or
+    exists(TestAllModels t)
+  )
+  or
+  exists(string other | isRelevantType(other) |
+    typeModel(type, other, _)
+    or
+    Specific::hasImplicitTypeModel(type, other)
+  )
+}
+
+/**
+ * Holds if `type,path` is used in some row.
+ */
+pragma[nomagic]
+predicate isRelevantFullPath(string type, string path) {
+  isRelevantType(type) and
+  (
+    sourceModel(type, path, _, _) or
+    sinkModel(type, path, _, _) or
+    summaryModel(type, path, _, _, _, _) or
+    typeModel(_, type, path)
+  )
+}
+
+/** A string from a row that should be parsed as an access path. */
+private predicate accessPathRange(string s) {
+  isRelevantFullPath(_, s)
+  or
+  exists(string type | isRelevantType(type) |
+    summaryModel(type, _, s, _, _, _) or
+    summaryModel(type, _, _, s, _, _)
+  )
+  or
+  typeVariableModel(_, s)
+}
+
+import AccessPath<accessPathRange/1>
+
+/**
+ * Gets a successor of `node` in the API graph.
+ */
+bindingset[token]
+API::Node getSuccessorFromNode(API::Node node, AccessPathTokenBase token) {
+  // API graphs use the same label for arguments and parameters. An edge originating from a
+  // use-node represents an argument, and an edge originating from a def-node represents a parameter.
+  // We just map both to the same thing.
+  token.getName() = ["Argument", "Parameter"] and
+  result = node.getParameter(parseIntUnbounded(token.getAnArgument()))
+  or
+  token.getName() = "ReturnValue" and
+  result = node.getReturn()
+  or
+  // Language-specific tokens
+  result = Specific::getExtraSuccessorFromNode(node, token)
+}
+
+/**
+ * Gets an API-graph successor for the given invocation.
+ */
+bindingset[token]
+API::Node getSuccessorFromInvoke(Specific::InvokeNode invoke, AccessPathTokenBase token) {
+  token.getName() = "Argument" and
+  result = invoke.getParameter(parseIntWithArity(token.getAnArgument(), invoke.getNumArgument()))
+  or
+  token.getName() = "ReturnValue" and
+  result = invoke.getReturn()
+  or
+  // Language-specific tokens
+  result = Specific::getExtraSuccessorFromInvoke(invoke, token)
+}
+
+/**
+ * Holds if `invoke` invokes a call-site filter given by `token`.
+ */
+bindingset[token]
+private predicate invocationMatchesCallSiteFilter(
+  Specific::InvokeNode invoke, AccessPathTokenBase token
+) {
+  token.getName() = "WithArity" and
+  invoke.getNumArgument() = parseIntUnbounded(token.getAnArgument())
+  or
+  Specific::invocationMatchesExtraCallSiteFilter(invoke, token)
+}
+
+private class TypeModelUseEntry extends API::EntryPoint {
+  private string type;
+
+  TypeModelUseEntry() {
+    exists(any(TypeModel tm).getASource(type)) and
+    this = "TypeModelUseEntry;" + type
+  }
+
+  override DataFlow::LocalSourceNode getASource() { result = any(TypeModel tm).getASource(type) }
+
+  API::Node getNodeForType(string type_) { type = type_ and result = this.getANode() }
+}
+
+private class TypeModelDefEntry extends API::EntryPoint {
+  private string type;
+
+  TypeModelDefEntry() {
+    exists(any(TypeModel tm).getASink(type)) and
+    this = "TypeModelDefEntry;" + type
+  }
+
+  override DataFlow::Node getASink() { result = any(TypeModel tm).getASink(type) }
+
+  API::Node getNodeForType(string type_) { type = type_ and result = this.getANode() }
+}
+
+/**
+ * Gets an API node identified by the given `type`.
+ */
+pragma[nomagic]
+private API::Node getNodeFromType(string type) {
+  exists(string type2, AccessPath path2 |
+    typeModel(type, type2, path2) and
+    result = getNodeFromPath(type2, path2)
+  )
+  or
+  result = any(TypeModelUseEntry e).getNodeForType(type)
+  or
+  result = any(TypeModelDefEntry e).getNodeForType(type)
+  or
+  result = any(TypeModel t).getAnApiNode(type)
+  or
+  result = Specific::getExtraNodeFromType(type)
+}
+
+/**
+ * Gets the API node identified by the first `n` tokens of `path` in the given `(type, path)` tuple.
+ */
+pragma[nomagic]
+API::Node getNodeFromPath(string type, AccessPath path, int n) {
+  isRelevantFullPath(type, path) and
+  (
+    n = 0 and
+    result = getNodeFromType(type)
+    or
+    result = Specific::getExtraNodeFromPath(type, path, n)
+  )
+  or
+  result = getSuccessorFromNode(getNodeFromPath(type, path, n - 1), path.getToken(n - 1))
+  or
+  // Similar to the other recursive case, but where the path may have stepped through one or more call-site filters
+  result = getSuccessorFromInvoke(getInvocationFromPath(type, path, n - 1), path.getToken(n - 1))
+  or
+  // Apply a subpath
+  result = getNodeFromSubPath(getNodeFromPath(type, path, n - 1), getSubPathAt(path, n - 1))
+  or
+  // Apply a type step
+  typeStep(getNodeFromPath(type, path, n), result)
+  or
+  // Apply a fuzzy step (without advancing 'n')
+  path.getToken(n).getName() = "Fuzzy" and
+  result = Specific::getAFuzzySuccessor(getNodeFromPath(type, path, n))
+  or
+  // Skip a fuzzy step (advance 'n' without changing the current node)
+  path.getToken(n - 1).getName() = "Fuzzy" and
+  result = getNodeFromPath(type, path, n - 1)
+}
+
+/**
+ * Gets a subpath for the `TypeVar` token found at the `n`th token of `path`.
+ */
+pragma[nomagic]
+private AccessPath getSubPathAt(AccessPath path, int n) {
+  exists(string typeVarName |
+    path.getToken(n).getAnArgument("TypeVar") = typeVarName and
+    typeVariableModel(typeVarName, result)
+  )
+}
+
+/**
+ * Gets a node that is found by evaluating the first `n` tokens of `subPath` starting at `base`.
+ */
+pragma[nomagic]
+private API::Node getNodeFromSubPath(API::Node base, AccessPath subPath, int n) {
+  exists(AccessPath path, int k |
+    base = [getNodeFromPath(_, path, k), getNodeFromSubPath(_, path, k)] and
+    subPath = getSubPathAt(path, k) and
+    result = base and
+    n = 0
+  )
+  or
+  exists(string type, AccessPath basePath |
+    typeStepModel(type, basePath, subPath) and
+    base = getNodeFromPath(type, basePath) and
+    result = base and
+    n = 0
+  )
+  or
+  result = getSuccessorFromNode(getNodeFromSubPath(base, subPath, n - 1), subPath.getToken(n - 1))
+  or
+  result =
+    getSuccessorFromInvoke(getInvocationFromSubPath(base, subPath, n - 1), subPath.getToken(n - 1))
+  or
+  result =
+    getNodeFromSubPath(getNodeFromSubPath(base, subPath, n - 1), getSubPathAt(subPath, n - 1))
+  or
+  typeStep(getNodeFromSubPath(base, subPath, n), result) and
+  // Only apply type-steps strictly between the steps on the sub path, not before and after.
+  // Steps before/after lead to unnecessary transitive edges, which the user of the sub-path
+  // will themselves find by following type-steps.
+  n > 0 and
+  n < subPath.getNumToken()
+  or
+  // Apply a fuzzy step (without advancing 'n')
+  subPath.getToken(n).getName() = "Fuzzy" and
+  result = Specific::getAFuzzySuccessor(getNodeFromSubPath(base, subPath, n))
+  or
+  // Skip a fuzzy step (advance 'n' without changing the current node)
+  subPath.getToken(n - 1).getName() = "Fuzzy" and
+  result = getNodeFromSubPath(base, subPath, n - 1)
+}
+
+/**
+ * Gets a call site that is found by evaluating the first `n` tokens of `subPath` starting at `base`.
+ */
+private Specific::InvokeNode getInvocationFromSubPath(API::Node base, AccessPath subPath, int n) {
+  result = Specific::getAnInvocationOf(getNodeFromSubPath(base, subPath, n))
+  or
+  result = getInvocationFromSubPath(base, subPath, n - 1) and
+  invocationMatchesCallSiteFilter(result, subPath.getToken(n - 1))
+}
+
+/**
+ * Gets a node that is found by evaluating `subPath` starting at `base`.
+ */
+pragma[nomagic]
+private API::Node getNodeFromSubPath(API::Node base, AccessPath subPath) {
+  result = getNodeFromSubPath(base, subPath, subPath.getNumToken())
+}
+
+/** Gets the node identified by the given `(type, path)` tuple. */
+private API::Node getNodeFromPath(string type, AccessPath path) {
+  result = getNodeFromPath(type, path, path.getNumToken())
+}
+
+pragma[nomagic]
+private predicate typeStepModel(string type, AccessPath basePath, AccessPath output) {
+  summaryModel(type, basePath, "", output, "type", _)
+}
+
+pragma[nomagic]
+private predicate typeStep(API::Node pred, API::Node succ) {
+  exists(string type, AccessPath basePath, AccessPath output |
+    typeStepModel(type, basePath, output) and
+    pred = getNodeFromPath(type, basePath) and
+    succ = getNodeFromSubPath(pred, output)
+  )
+}
+
+/**
+ * Gets an invocation identified by the given `(type, path)` tuple.
+ *
+ * Unlike `getNodeFromPath`, the `path` may end with one or more call-site filters.
+ */
+private Specific::InvokeNode getInvocationFromPath(string type, AccessPath path, int n) {
+  result = Specific::getAnInvocationOf(getNodeFromPath(type, path, n))
+  or
+  result = getInvocationFromPath(type, path, n - 1) and
+  invocationMatchesCallSiteFilter(result, path.getToken(n - 1))
+}
+
+/** Gets an invocation identified by the given `(type, path)` tuple. */
+private Specific::InvokeNode getInvocationFromPath(string type, AccessPath path) {
+  result = getInvocationFromPath(type, path, path.getNumToken())
+}
+
+/**
+ * Holds if `name` is a valid name for an access path token in the identifying access path.
+ */
+bindingset[name]
+private predicate isValidTokenNameInIdentifyingAccessPath(string name) {
+  name = ["Argument", "Parameter", "ReturnValue", "WithArity", "TypeVar", "Fuzzy"]
+  or
+  Specific::isExtraValidTokenNameInIdentifyingAccessPath(name)
+}
+
+/**
+ * Holds if `name` is a valid name for an access path token with no arguments, occurring
+ * in an identifying access path.
+ */
+bindingset[name]
+private predicate isValidNoArgumentTokenInIdentifyingAccessPath(string name) {
+  name = ["ReturnValue", "Fuzzy"]
+  or
+  Specific::isExtraValidNoArgumentTokenInIdentifyingAccessPath(name)
+}
+
+/**
+ * Holds if `argument` is a valid argument to an access path token with the given `name`, occurring
+ * in an identifying access path.
+ */
+bindingset[name, argument]
+private predicate isValidTokenArgumentInIdentifyingAccessPath(string name, string argument) {
+  name = ["Argument", "Parameter"] and
+  argument.regexpMatch("(N-|-)?\\d+(\\.\\.((N-|-)?\\d+)?)?")
+  or
+  name = "WithArity" and
+  argument.regexpMatch("\\d+(\\.\\.(\\d+)?)?")
+  or
+  name = "TypeVar" and
+  exists(argument)
+  or
+  Specific::isExtraValidTokenArgumentInIdentifyingAccessPath(name, argument)
+}
+
+/**
+ * Module providing access to the imported models in terms of API graph nodes.
+ */
+module ModelOutput {
+  cached
+  private module Cached {
+    /**
+     * Holds if a source model contributed `source` with the given `kind`.
+     */
+    cached
+    API::Node getASourceNode(string kind, string model) {
+      exists(string type, string path |
+        sourceModel(type, path, kind, model) and
+        result = getNodeFromPath(type, path)
+      )
+    }
+
+    /**
+     * Holds if a sink model contributed `sink` with the given `kind`.
+     */
+    cached
+    API::Node getASinkNode(string kind, string model) {
+      exists(string type, string path |
+        sinkModel(type, path, kind, model) and
+        result = getNodeFromPath(type, path)
+      )
+    }
+
+    /**
+     * Holds if a relevant summary exists for these parameters.
+     */
+    cached
+    predicate relevantSummaryModel(
+      string type, string path, string input, string output, string kind, string model
+    ) {
+      isRelevantType(type) and
+      summaryModel(type, path, input, output, kind, model)
+    }
+
+    /**
+     * Holds if a `baseNode` is an invocation identified by the `type,path` part of a summary row.
+     */
+    cached
+    predicate resolvedSummaryBase(string type, string path, Specific::InvokeNode baseNode) {
+      summaryModel(type, path, _, _, _, _) and
+      baseNode = getInvocationFromPath(type, path)
+    }
+
+    /**
+     * Holds if a `baseNode` is a callable identified by the `type,path` part of a summary row.
+     */
+    cached
+    predicate resolvedSummaryRefBase(string type, string path, API::Node baseNode) {
+      summaryModel(type, path, _, _, _, _) and
+      baseNode = getNodeFromPath(type, path)
+    }
+
+    /**
+     * Holds if `node` is seen as an instance of `type` due to a type definition
+     * contributed by a model.
+     */
+    cached
+    API::Node getATypeNode(string type) { result = getNodeFromType(type) }
+  }
+
+  import Cached
+  import Specific::ModelOutputSpecific
+  private import codeql.mad.ModelValidation as SharedModelVal
+
+  /**
+   * Holds if a CSV source model contributed `source` with the given `kind`.
+   */
+  API::Node getASourceNode(string kind) { result = getASourceNode(kind, _) }
+
+  /**
+   * Holds if a CSV sink model contributed `sink` with the given `kind`.
+   */
+  API::Node getASinkNode(string kind) { result = getASinkNode(kind, _) }
+
+  private module KindValConfig implements SharedModelVal::KindValidationConfigSig {
+    predicate summaryKind(string kind) { summaryModel(_, _, _, _, kind, _) }
+
+    predicate sinkKind(string kind) { sinkModel(_, _, kind, _) }
+
+    predicate sourceKind(string kind) { sourceModel(_, _, kind, _) }
+  }
+
+  private module KindVal = SharedModelVal::KindValidation<KindValConfig>;
+
+  /**
+   * Gets an error message relating to an invalid CSV row in a model.
+   */
+  string getAWarning() {
+    // Check names and arguments of access path tokens
+    exists(AccessPath path, AccessPathToken token |
+      (isRelevantFullPath(_, path) or typeVariableModel(_, path)) and
+      token = path.getToken(_)
+    |
+      not isValidTokenNameInIdentifyingAccessPath(token.getName()) and
+      result = "Invalid token name '" + token.getName() + "' in access path: " + path
+      or
+      isValidTokenNameInIdentifyingAccessPath(token.getName()) and
+      exists(string argument |
+        argument = token.getAnArgument() and
+        not isValidTokenArgumentInIdentifyingAccessPath(token.getName(), argument) and
+        result =
+          "Invalid argument '" + argument + "' in token '" + token + "' in access path: " + path
+      )
+      or
+      isValidTokenNameInIdentifyingAccessPath(token.getName()) and
+      token.getNumArgument() = 0 and
+      not isValidNoArgumentTokenInIdentifyingAccessPath(token.getName()) and
+      result = "Invalid token '" + token + "' is missing its arguments, in access path: " + path
+    )
+    or
+    // Check for invalid model kinds
+    result = KindVal::getInvalidModelKind()
+  }
+}
diff --git a/powershell/ql/lib/semmle/code/powershell/frameworks/data/internal/ApiGraphModelsExtensions.qll b/powershell/ql/lib/semmle/code/powershell/frameworks/data/internal/ApiGraphModelsExtensions.qll
new file mode 100644
index 00000000000..b86d7de457e
--- /dev/null
+++ b/powershell/ql/lib/semmle/code/powershell/frameworks/data/internal/ApiGraphModelsExtensions.qll
@@ -0,0 +1,69 @@
+/**
+ * Defines extensible predicates for contributing library models from data extensions.
+ */
+
+/**
+ * Holds if the value at `(type, path)` should be seen as a flow
+ * source of the given `kind`.
+ *
+ * The kind `remote` represents a general remote flow source.
+ */
+extensible predicate sourceModel(
+  string type, string path, string kind, QlBuiltins::ExtensionId madId
+);
+
+/**
+ * Holds if the value at `(type, path)` should be seen as a sink
+ * of the given `kind`.
+ */
+extensible predicate sinkModel(string type, string path, string kind, QlBuiltins::ExtensionId madId);
+
+/**
+ * Holds if in calls to `(type, path)`, the value referred to by `input`
+ * can flow to the value referred to by `output`.
+ *
+ * `kind` should be either `value` or `taint`, for value-preserving or taint-preserving steps,
+ * respectively.
+ */
+extensible predicate summaryModel(
+  string type, string path, string input, string output, string kind, QlBuiltins::ExtensionId madId
+);
+
+/**
+ * Holds if calls to `(type, path)` should be considered neutral. The meaning of this depends on the `kind`.
+ * If `kind` is `summary`, the call does not propagate data flow. If `kind` is `source`, the call is not a source.
+ * If `kind` is `sink`, the call is not a sink.
+ */
+extensible predicate neutralModel(string type, string path, string kind);
+
+/**
+ * Holds if `(type2, path)` should be seen as an instance of `type1`.
+ */
+extensible predicate typeModel(string type1, string type2, string path);
+
+/**
+ * Holds if `path` can be substituted for a token `TypeVar[name]`.
+ */
+extensible predicate typeVariableModel(string name, string path);
+
+/**
+ * Holds if the given extension tuple `madId` should pretty-print as `model`.
+ *
+ * This predicate should only be used in tests.
+ */
+predicate interpretModelForTest(QlBuiltins::ExtensionId madId, string model) {
+  exists(string type, string path, string kind |
+    sourceModel(type, path, kind, madId) and
+    model = "Source: " + type + "; " + path + "; " + kind
+  )
+  or
+  exists(string type, string path, string kind |
+    sinkModel(type, path, kind, madId) and
+    model = "Sink: " + type + "; " + path + "; " + kind
+  )
+  or
+  exists(string type, string path, string input, string output, string kind |
+    summaryModel(type, path, input, output, kind, madId) and
+    model = "Summary: " + type + "; " + path + "; " + input + "; " + output + "; " + kind
+  )
+}
diff --git a/powershell/ql/lib/semmle/code/powershell/frameworks/data/internal/ApiGraphModelsSpecific.qll b/powershell/ql/lib/semmle/code/powershell/frameworks/data/internal/ApiGraphModelsSpecific.qll
new file mode 100644
index 00000000000..9bf974f325b
--- /dev/null
+++ b/powershell/ql/lib/semmle/code/powershell/frameworks/data/internal/ApiGraphModelsSpecific.qll
@@ -0,0 +1,229 @@
+/**
+ * Contains the language-specific part of the models-as-data implementation found in `ApiGraphModels.qll`.
+ *
+ * It must export the following members:
+ * ```ql
+ * class Unit // a unit type
+ * class InvokeNode // a type representing an invocation connected to the API graph
+ * module API // the API graph module
+ * predicate isPackageUsed(string package)
+ * API::Node getExtraNodeFromPath(string package, string type, string path, int n)
+ * API::Node getExtraSuccessorFromNode(API::Node node, AccessPathTokenBase token)
+ * API::Node getExtraSuccessorFromInvoke(InvokeNode node, AccessPathTokenBase token)
+ * predicate invocationMatchesExtraCallSiteFilter(InvokeNode invoke, AccessPathTokenBase token)
+ * InvokeNode getAnInvocationOf(API::Node node)
+ * predicate isExtraValidTokenNameInIdentifyingAccessPath(string name)
+ * predicate isExtraValidNoArgumentTokenInIdentifyingAccessPath(string name)
+ * predicate isExtraValidTokenArgumentInIdentifyingAccessPath(string name, string argument)
+ * ```
+ */
+
+private import powershell
+private import ApiGraphModels
+private import semmle.code.powershell.dataflow.internal.FlowSummaryImpl as FlowSummaryImpl
+private import codeql.dataflow.internal.AccessPathSyntax
+// Re-export libraries needed by ApiGraphModels.qll
+import semmle.code.powershell.ApiGraphs
+import semmle.code.powershell.dataflow.DataFlow::DataFlow as DataFlow
+private import FlowSummaryImpl::Public
+private import semmle.code.powershell.dataflow.internal.DataFlowDispatch as DataFlowDispatch
+
+bindingset[rawType]
+predicate isTypeUsed(string rawType) { any() }
+
+bindingset[rawType]
+private predicate parseType(string rawType, string consts, string suffix) {
+  exists(string regexp |
+    regexp = "([^!]+)(!|)" and
+    consts = rawType.regexpCapture(regexp, 1) and
+    suffix = rawType.regexpCapture(regexp, 2)
+  )
+}
+
+private predicate parseRelevantType(string rawType, string consts, string suffix) {
+  isRelevantType(rawType) and
+  parseType(rawType, consts, suffix)
+}
+
+/**
+ * Holds if `type` can be obtained from an instance of `otherType` due to
+ * language semantics modeled by `getExtraNodeFromType`.
+ */
+bindingset[otherType]
+predicate hasImplicitTypeModel(string type, string otherType) {
+  // A::B! can be used to obtain A::B
+  parseType(otherType, type, _)
+}
+
+pragma[nomagic]
+string getConstComponent(string consts, int n) {
+  parseRelevantType(_, consts, _) and
+  result = consts.splitAt(".", n)
+}
+
+private int getNumConstComponents(string consts) {
+  result = strictcount(int n | exists(getConstComponent(consts, n)))
+}
+
+private DataFlow::TypePathNode getConstantFromConstPath(string consts, int n) {
+  n = 1 and
+  result.getComponent() = getConstComponent(consts, 0)
+  or
+  result = getConstantFromConstPath(consts, n - 1).getConstant(getConstComponent(consts, n - 1))
+}
+
+private DataFlow::TypePathNode getConstantFromConstPath(string consts) {
+  result = getConstantFromConstPath(consts, getNumConstComponents(consts))
+}
+
+/** Gets a Powershell-specific interpretation of the `(type, path)` tuple after resolving the first `n` access path tokens. */
+bindingset[type, path]
+API::Node getExtraNodeFromPath(string type, AccessPath path, int n) {
+  // A row of form `any;Method[foo]` should match any method named `foo`.
+  type = "any" and
+  n = 1 and
+  exists(string methodName, DataFlow::CallNode call |
+    methodMatchedByName(path, methodName) and
+    call.getName() = methodName and
+    result.(API::MethodAccessNode).asCall() = call
+  )
+}
+
+/** Gets a Powershell-specific interpretation of the given `type`. */
+API::Node getExtraNodeFromType(string type) {
+  exists(string consts, string suffix, DataFlow::TypePathNode constRef |
+    parseRelevantType(type, consts, suffix) and
+    constRef = getConstantFromConstPath(consts)
+  |
+    suffix = "!" and
+    result = constRef.track()
+    or
+    suffix = "" and
+    result = constRef.track().getInstance()
+  )
+  or
+  type = "" and
+  result = API::root()
+}
+
+/**
+ * Holds if `path` occurs in a CSV row with type `any`, meaning it can start
+ * matching anywhere, and the path begins with `Method[methodName]`.
+ */
+private predicate methodMatchedByName(AccessPath path, string methodName) {
+  isRelevantFullPath("any", path) and
+  exists(AccessPathToken token |
+    token = path.getToken(0) and
+    token.getName() = "Method" and
+    methodName = token.getAnArgument()
+  )
+}
+
+/**
+ * Gets a Powershell-specific API graph successor of `node` reachable by resolving `token`.
+ */
+bindingset[token]
+API::Node getExtraSuccessorFromNode(API::Node node, AccessPathTokenBase token) {
+  token.getName() = "Member" and
+  result = node.getMember(token.getAnArgument())
+  or
+  token.getName() = "Method" and
+  result = node.getMethod(token.getAnArgument())
+  or
+  token.getName() = "Instance" and
+  result = node.getInstance()
+  or
+  token.getName() = "Parameter" and
+  exists(DataFlowDispatch::ArgumentPosition argPos, DataFlowDispatch::ParameterPosition paramPos |
+    token.getAnArgument() = FlowSummaryImpl::Input::encodeArgumentPosition(argPos) and
+    DataFlowDispatch::parameterMatch(paramPos, argPos) and
+    result = node.getParameterAtPosition(paramPos)
+  )
+  or
+  exists(DataFlow::ContentSet contents |
+    token.getName() = FlowSummaryImpl::Input::encodeContent(contents, token.getAnArgument()) and
+    result = node.getContents(contents)
+  )
+}
+
+/**
+ * Gets a Powershell-specific API graph successor of `node` reachable by resolving `token`.
+ */
+bindingset[token]
+API::Node getExtraSuccessorFromInvoke(InvokeNode node, AccessPathTokenBase token) {
+  token.getName() = "Argument" and
+  exists(DataFlowDispatch::ArgumentPosition argPos, DataFlowDispatch::ParameterPosition paramPos |
+    token.getAnArgument() = FlowSummaryImpl::Input::encodeParameterPosition(paramPos) and
+    DataFlowDispatch::parameterMatch(paramPos, argPos) and
+    result = node.getArgumentAtPosition(argPos)
+  )
+}
+
+pragma[inline]
+API::Node getAFuzzySuccessor(API::Node node) {
+  result = node.getMethod(_)
+  or
+  result =
+    node.getArgumentAtPosition(any(DataFlowDispatch::ArgumentPosition apos | not apos.isThis()))
+  or
+  result =
+    node.getParameterAtPosition(any(DataFlowDispatch::ParameterPosition ppos | not ppos.isThis()))
+  or
+  result = node.getReturn()
+  or
+  result = node.getAnElement()
+  or
+  result = node.getInstance()
+}
+
+/**
+ * Holds if `invoke` matches the Powershell-specific call site filter in `token`.
+ */
+bindingset[token]
+predicate invocationMatchesExtraCallSiteFilter(InvokeNode invoke, AccessPathTokenBase token) {
+  none()
+}
+
+/** An API graph node representing a method call. */
+class InvokeNode extends API::MethodAccessNode {
+  /** Gets the number of arguments to the call. */
+  int getNumArgument() { result = this.asCall().getNumberOfArguments() }
+}
+
+/** Gets the `InvokeNode` corresponding to a specific invocation of `node`. */
+InvokeNode getAnInvocationOf(API::Node node) { result = node }
+
+/**
+ * Holds if `name` is a valid name for an access path token in the identifying access path.
+ */
+bindingset[name]
+predicate isExtraValidTokenNameInIdentifyingAccessPath(string name) {
+  name = ["Member", "Method", "Instance", "WithBlock", "WithoutBlock", "Element", "Field"]
+}
+
+/**
+ * Holds if `name` is a valid name for an access path token with no arguments, occurring
+ * in an identifying access path.
+ */
+predicate isExtraValidNoArgumentTokenInIdentifyingAccessPath(string name) {
+  name = ["Instance", "WithBlock", "WithoutBlock"]
+}
+
+/**
+ * Holds if `argument` is a valid argument to an access path token with the given `name`, occurring
+ * in an identifying access path.
+ */
+bindingset[name, argument]
+predicate isExtraValidTokenArgumentInIdentifyingAccessPath(string name, string argument) {
+  name = ["Member", "Method", "Element", "Field"] and
+  exists(argument)
+  or
+  name = ["Argument", "Parameter"] and
+  (
+    argument = ["self", "lambda-self", "block", "any", "any-named"]
+    or
+    argument.regexpMatch("\\w+:") // keyword argument
+  )
+}
+
+module ModelOutputSpecific { }
diff --git a/powershell/ql/lib/semmle/code/powershell/security/CommandInjectionCustomizations.qll b/powershell/ql/lib/semmle/code/powershell/security/CommandInjectionCustomizations.qll
new file mode 100644
index 00000000000..1623941fb82
--- /dev/null
+++ b/powershell/ql/lib/semmle/code/powershell/security/CommandInjectionCustomizations.qll
@@ -0,0 +1,65 @@
+/**
+ * Provides default sources, sinks and sanitizers for reasoning about
+ * command-injection vulnerabilities, as well as extension points for
+ * adding your own.
+ */
+
+private import semmle.code.powershell.dataflow.DataFlow
+private import semmle.code.powershell.dataflow.flowsources.FlowSources
+private import semmle.code.powershell.Cfg
+
+module CommandInjection {
+  /**
+   * A data flow source for command-injection vulnerabilities.
+   */
+  abstract class Source extends DataFlow::Node {
+    /** Gets a string that describes the type of this flow source. */
+    abstract string getSourceType();
+  }
+
+  /**
+   * A data flow sink for command-injection vulnerabilities.
+   */
+  abstract class Sink extends DataFlow::Node { }
+
+  /**
+   * A sanitizer for command-injection vulnerabilities.
+   */
+  abstract class Sanitizer extends DataFlow::Node { }
+
+  /** A source of user input, considered as a flow source for command injection. */
+  class FlowSourceAsSource extends Source instanceof SourceNode {
+    override string getSourceType() { result = "user-provided value" }
+  }
+
+  /**
+   * A command argument to a function that initiates an operating system command.
+   */
+  class SystemCommandExecutionSink extends Sink {
+    SystemCommandExecutionSink() {
+      // An argument to a call
+      exists(DataFlow::CallNode call |
+        call.getName() = "Invoke-Expression" and
+        call.getAnArgument() = this
+      )
+      or
+      // Or the call command itself in case it's a use of operator &.
+      any(DataFlow::CallOperatorNode call).getCommand() = this
+    }
+  }
+
+  class AddTypeSink extends Sink {
+    AddTypeSink() {
+      exists(DataFlow::CallNode call |
+        call.getName() = "Add-Type" and
+        call.getAnArgument() = this
+      )
+    }
+  }
+
+  private class ExternalCommandInjectionSink extends Sink {
+    ExternalCommandInjectionSink() {
+      this = ModelOutput::getASinkNode("command-injection").asSink()
+    }
+  }
+}
diff --git a/powershell/ql/lib/semmle/code/powershell/security/CommandInjectionQuery.qll b/powershell/ql/lib/semmle/code/powershell/security/CommandInjectionQuery.qll
new file mode 100644
index 00000000000..dd7283d1546
--- /dev/null
+++ b/powershell/ql/lib/semmle/code/powershell/security/CommandInjectionQuery.qll
@@ -0,0 +1,26 @@
+/**
+ * Provides a taint tracking configuration for reasoning about
+ * command-injection vulnerabilities (CWE-078).
+ *
+ * Note, for performance reasons: only import this file if
+ * `CommandInjectionFlow` is needed, otherwise
+ * `CommandInjectionCustomizations` should be imported instead.
+ */
+
+import powershell
+import semmle.code.powershell.dataflow.TaintTracking
+import CommandInjectionCustomizations::CommandInjection
+import semmle.code.powershell.dataflow.DataFlow
+
+private module Config implements DataFlow::ConfigSig {
+  predicate isSource(DataFlow::Node source) { source instanceof Source }
+
+  predicate isSink(DataFlow::Node sink) { sink instanceof Sink }
+
+  predicate isBarrier(DataFlow::Node node) { node instanceof Sanitizer }
+}
+
+/**
+ * Taint-tracking for reasoning about command-injection vulnerabilities.
+ */
+module CommandInjectionFlow = TaintTracking::Global<Config>;
diff --git a/powershell/ql/lib/semmle/code/powershell/typetracking/ApiGraphShared.qll b/powershell/ql/lib/semmle/code/powershell/typetracking/ApiGraphShared.qll
new file mode 100644
index 00000000000..8efac32b762
--- /dev/null
+++ b/powershell/ql/lib/semmle/code/powershell/typetracking/ApiGraphShared.qll
@@ -0,0 +1,328 @@
+/**
+ * Parts of API graphs that can be shared with other dynamic languages.
+ *
+ * Depends on TypeTrackerSpecific for the corresponding language.
+ */
+
+private import codeql.util.Location
+private import semmle.code.powershell.dataflow.DataFlow
+private import semmle.code.powershell.typetracking.internal.TypeTrackingImpl
+
+/**
+ * The signature to use when instantiating `ApiGraphShared`.
+ *
+ * The implementor should define a newtype with at least three branches as follows:
+ * ```ql
+ * newtype TApiNode =
+ *   MkForwardNode(LocalSourceNode node, TypeTracker t) { isReachable(node, t) } or
+ *   MkBackwardNode(LocalSourceNode node, TypeTracker t) { isReachable(node, t) } or
+ *   MkSinkNode(Node node) { ... } or
+ *   ...
+ * ```
+ *
+ * The three branches should be exposed through `getForwardNode`, `getBackwardNode`, and `getSinkNode`, respectively.
+ */
+signature module ApiGraphSharedSig {
+  /** A node in the API graph. */
+  class ApiNode {
+    /** Gets a string representation of this API node. */
+    string toString();
+
+    /** Gets the location associated with this API node, if any. */
+    Location getLocation();
+  }
+
+  /**
+   * Gets the forward node with the given type-tracking state.
+   *
+   * This node will have outgoing epsilon edges to its type-tracking successors.
+   */
+  ApiNode getForwardNode(DataFlow::LocalSourceNode node, TypeTracker t);
+
+  /**
+   * Gets the backward node with the given type-tracking state.
+   *
+   * This node will have outgoing epsilon edges to its type-tracking predecessors.
+   */
+  ApiNode getBackwardNode(DataFlow::LocalSourceNode node, TypeTracker t);
+
+  /**
+   * Gets the sink node corresponding to `node`.
+   *
+   * Since sinks are not generally `LocalSourceNode`s, such nodes are materialised separately in order for
+   * the API graph to include representatives for sinks. Note that there is no corresponding case for "source"
+   * nodes as these are represented as forward nodes with initial-state type-trackers.
+   *
+   * Sink nodes have outgoing epsilon edges to the backward nodes corresponding to their local sources.
+   */
+  ApiNode getSinkNode(DataFlow::Node node);
+
+  /**
+   * Holds if a language-specific epsilon edge `pred -> succ` should be generated.
+   */
+  predicate specificEpsilonEdge(ApiNode pred, ApiNode succ);
+}
+
+/**
+ * Parts of API graphs that can be shared between language implementations.
+ */
+module ApiGraphShared<ApiGraphSharedSig S> {
+  private import S
+
+  /** Gets a local source of `node`. */
+  bindingset[node]
+  pragma[inline_late]
+  DataFlow::LocalSourceNode getALocalSourceStrict(DataFlow::Node node) {
+    result = node.getALocalSource()
+  }
+
+  cached
+  private module Cached {
+    /**
+     * Holds if there is an epsilon edge `pred -> succ`.
+     *
+     * That relation is reflexive, so `fastTC` produces the equivalent of a reflexive, transitive closure.
+     */
+    pragma[noopt]
+    cached
+    predicate epsilonEdge(ApiNode pred, ApiNode succ) {
+      exists(
+        StepSummary summary, DataFlow::LocalSourceNode predNode, TypeTracker predState,
+        DataFlow::LocalSourceNode succNode, TypeTracker succState
+      |
+        step(predNode, succNode, summary)
+      |
+        pred = getForwardNode(predNode, predState) and
+        succState = append(predState, summary) and
+        succ = getForwardNode(succNode, succState)
+        or
+        succ = getBackwardNode(predNode, predState) and // swap order for backward flow
+        succState = append(predState, summary) and
+        pred = getBackwardNode(succNode, succState) // swap order for backward flow
+      )
+      or
+      exists(DataFlow::Node sink, DataFlow::LocalSourceNode localSource |
+        pred = getSinkNode(sink) and
+        localSource = getALocalSourceStrict(sink) and
+        succ = getBackwardStartNode(localSource)
+      )
+      or
+      specificEpsilonEdge(pred, succ)
+      or
+      succ instanceof ApiNode and
+      succ = pred
+    }
+
+    /**
+     * Holds if `pred` can reach `succ` by zero or more epsilon edges.
+     */
+    cached
+    predicate epsilonStar(ApiNode pred, ApiNode succ) = fastTC(epsilonEdge/2)(pred, succ)
+
+    /** Gets the API node to use when starting forward flow from `source` */
+    cached
+    ApiNode forwardStartNode(DataFlow::LocalSourceNode source) {
+      result = getForwardNode(source, noContentTypeTracker(false))
+    }
+
+    /** Gets the API node to use when starting backward flow from `sink` */
+    cached
+    ApiNode backwardStartNode(DataFlow::LocalSourceNode sink) {
+      // There is backward flow A->B iff there is forward flow B->A.
+      // The starting point of backward flow corresponds to the end of a forward flow, and vice versa.
+      result = getBackwardNode(sink, noContentTypeTracker(_))
+    }
+
+    /** Gets `node` as a data flow source. */
+    cached
+    DataFlow::LocalSourceNode asSourceCached(ApiNode node) { node = forwardEndNode(result) }
+
+    /** Gets `node` as a data flow sink. */
+    cached
+    DataFlow::Node asSinkCached(ApiNode node) { node = getSinkNode(result) }
+  }
+
+  private import Cached
+
+  /** Gets an API node corresponding to the end of forward-tracking to `localSource`. */
+  pragma[nomagic]
+  private ApiNode forwardEndNode(DataFlow::LocalSourceNode localSource) {
+    result = getForwardNode(localSource, noContentTypeTracker(_))
+  }
+
+  /** Gets an API node corresponding to the end of backtracking to `localSource`. */
+  pragma[nomagic]
+  private ApiNode backwardEndNode(DataFlow::LocalSourceNode localSource) {
+    result = getBackwardNode(localSource, noContentTypeTracker(false))
+  }
+
+  /** Gets a node reachable from `node` by zero or more epsilon edges, including `node` itself. */
+  bindingset[node]
+  pragma[inline_late]
+  ApiNode getAnEpsilonSuccessorInline(ApiNode node) { epsilonStar(node, result) }
+
+  /** Gets `node` as a data flow sink. */
+  bindingset[node]
+  pragma[inline_late]
+  DataFlow::Node asSinkInline(ApiNode node) { result = asSinkCached(node) }
+
+  /** Gets `node` as a data flow source. */
+  bindingset[node]
+  pragma[inline_late]
+  DataFlow::LocalSourceNode asSourceInline(ApiNode node) { result = asSourceCached(node) }
+
+  /** Gets a value reachable from `source`. */
+  bindingset[source]
+  pragma[inline_late]
+  DataFlow::Node getAValueReachableFromSourceInline(ApiNode source) {
+    exists(DataFlow::LocalSourceNode src |
+      src = asSourceInline(getAnEpsilonSuccessorInline(source)) and
+      src.flowsTo(pragma[only_bind_into](result))
+    )
+  }
+
+  /** Gets a value that can reach `sink`. */
+  bindingset[sink]
+  pragma[inline_late]
+  DataFlow::Node getAValueReachingSinkInline(ApiNode sink) {
+    backwardStartNode(result) = getAnEpsilonSuccessorInline(sink)
+  }
+
+  /**
+   * Gets the starting point for forward-tracking at `node`.
+   *
+   * Should be used to obtain the successor of an edge when constructing labelled edges.
+   */
+  bindingset[node]
+  pragma[inline_late]
+  ApiNode getForwardStartNode(DataFlow::Node node) { result = forwardStartNode(node) }
+
+  /**
+   * Gets the starting point of backtracking from `node`.
+   *
+   * Should be used to obtain the successor of an edge when constructing labelled edges.
+   */
+  bindingset[node]
+  pragma[inline_late]
+  ApiNode getBackwardStartNode(DataFlow::Node node) { result = backwardStartNode(node) }
+
+  /**
+   * Gets a possible ending point of forward-tracking at `node`.
+   *
+   * Should be used to obtain the predecessor of an edge when constructing labelled edges.
+   *
+   * This is not backed by a `cached` predicate, and should only be used for materialising `cached`
+   * predicates in the API graph implementation - it should not be called in later stages.
+   */
+  bindingset[node]
+  pragma[inline_late]
+  ApiNode getForwardEndNode(DataFlow::Node node) { result = forwardEndNode(node) }
+
+  /**
+   * Gets a possible ending point backtracking to `node`.
+   *
+   * Should be used to obtain the predecessor of an edge when constructing labelled edges.
+   *
+   * This is not backed by a `cached` predicate, and should only be used for materialising `cached`
+   * predicates in the API graph implementation - it should not be called in later stages.
+   */
+  bindingset[node]
+  pragma[inline_late]
+  ApiNode getBackwardEndNode(DataFlow::Node node) { result = backwardEndNode(node) }
+
+  /**
+   * Gets a possible eding point of forward or backward tracking at `node`.
+   *
+   * Should be used to obtain the predecessor of an edge generated from store or load edges.
+   */
+  bindingset[node]
+  pragma[inline_late]
+  ApiNode getForwardOrBackwardEndNode(DataFlow::Node node) {
+    result = getForwardEndNode(node) or result = getBackwardEndNode(node)
+  }
+
+  /** Gets an API node for tracking forward starting at `node`. This is the implementation of `DataFlow::LocalSourceNode.track()` */
+  bindingset[node]
+  pragma[inline_late]
+  ApiNode getNodeForForwardTracking(DataFlow::Node node) { result = forwardStartNode(node) }
+
+  /** Gets an API node for backtracking starting at `node`. The implementation of `DataFlow::Node.backtrack()`. */
+  bindingset[node]
+  pragma[inline_late]
+  ApiNode getNodeForBacktracking(DataFlow::Node node) {
+    result = getBackwardStartNode(getALocalSourceStrict(node))
+  }
+
+  /** Parts of the shared module to be re-exported by the user-facing `API` module. */
+  module Public {
+    /**
+     * The signature to use when instantiating the `ExplainFlow` module.
+     */
+    signature module ExplainFlowSig {
+      /** Holds if `node` should be a source. */
+      predicate isSource(ApiNode node);
+
+      /** Holds if `node` should be a sink. */
+      default predicate isSink(ApiNode node) { any() }
+
+      /** Holds if `node` should be skipped in the generated paths. */
+      default predicate isHidden(ApiNode node) { none() }
+    }
+
+    /**
+     * Module to help debug and visualize the data flows underlying API graphs.
+     *
+     * This module exports the query predicates for a path-problem query, and should be imported
+     * into the top-level of such a query.
+     *
+     * The module argument should specify source and sink API nodes, and the resulting query
+     * will show paths of epsilon edges that go from a source to a sink. Only epsilon edges are visualized.
+     *
+     * To condense the output a bit, paths in which the source and sink are the same node are omitted.
+     */
+    module ExplainFlow<ExplainFlowSig T> {
+      private import T
+
+      private ApiNode relevantNode() {
+        isSink(result) and
+        result = getAnEpsilonSuccessorInline(any(ApiNode node | isSource(node)))
+        or
+        epsilonEdge(result, relevantNode())
+      }
+
+      /** Holds if `node` is part of the graph to visualize. */
+      query predicate nodes(ApiNode node) { node = relevantNode() and not isHidden(node) }
+
+      private predicate edgeToHiddenNode(ApiNode pred, ApiNode succ) {
+        epsilonEdge(pred, succ) and
+        isHidden(succ) and
+        pred = relevantNode() and
+        succ = relevantNode()
+      }
+
+      /** Holds if `pred -> succ` is an edge in the graph to visualize. */
+      query predicate edges(ApiNode pred, ApiNode succ) {
+        nodes(pred) and
+        nodes(succ) and
+        exists(ApiNode mid |
+          edgeToHiddenNode*(pred, mid) and
+          epsilonEdge(mid, succ)
+        )
+      }
+
+      /** Holds for each source/sink pair to visualize in the graph. */
+      query predicate problems(
+        ApiNode location, ApiNode sourceNode, ApiNode sinkNode, string message
+      ) {
+        nodes(sourceNode) and
+        nodes(sinkNode) and
+        isSource(sourceNode) and
+        isSink(sinkNode) and
+        sinkNode = getAnEpsilonSuccessorInline(sourceNode) and
+        sourceNode != sinkNode and
+        location = sinkNode and
+        message = "Node flows here"
+      }
+    }
+  }
+}
diff --git a/powershell/ql/lib/semmle/code/powershell/typetracking/internal/TypeTrackingImpl.qll b/powershell/ql/lib/semmle/code/powershell/typetracking/internal/TypeTrackingImpl.qll
index e2d21739a57..8908c99491c 100644
--- a/powershell/ql/lib/semmle/code/powershell/typetracking/internal/TypeTrackingImpl.qll
+++ b/powershell/ql/lib/semmle/code/powershell/typetracking/internal/TypeTrackingImpl.qll
@@ -5,20 +5,36 @@ private import semmle.code.powershell.controlflow.Cfg as Cfg
 private import Cfg::CfgNodes
 private import codeql.typetracking.internal.SummaryTypeTracker as SummaryTypeTracker
 private import semmle.code.powershell.dataflow.DataFlow
+private import semmle.code.powershell.dataflow.FlowSummary as FlowSummary
 private import semmle.code.powershell.dataflow.internal.DataFlowImplCommon as DataFlowImplCommon
 private import semmle.code.powershell.dataflow.internal.DataFlowPublic as DataFlowPublic
 private import semmle.code.powershell.dataflow.internal.DataFlowPrivate as DataFlowPrivate
 private import semmle.code.powershell.dataflow.internal.DataFlowDispatch as DataFlowDispatch
+private import semmle.code.powershell.dataflow.internal.FlowSummaryImpl as FlowSummaryImpl
 private import codeql.util.Unit
 
+pragma[noinline]
+private predicate sourceArgumentPositionMatch(
+  CallCfgNode call, DataFlowPrivate::ArgumentNode arg, DataFlowDispatch::ParameterPosition ppos
+) {
+  exists(DataFlowDispatch::ArgumentPosition apos |
+    arg.sourceArgumentOf(call, apos) and
+    DataFlowDispatch::parameterMatch(ppos, apos)
+  )
+}
+
 pragma[noinline]
 private predicate argumentPositionMatch(
   DataFlowDispatch::DataFlowCall call, DataFlowPrivate::ArgumentNode arg,
   DataFlowDispatch::ParameterPosition ppos
 ) {
+  sourceArgumentPositionMatch(call.asCall(), arg, ppos)
+  or
   exists(DataFlowDispatch::ArgumentPosition apos |
+    DataFlowDispatch::parameterMatch(ppos, apos) and
     arg.argumentOf(call, apos) and
-    DataFlowDispatch::parameterMatch(ppos, apos)
+    call.getEnclosingCallable().asLibraryCallable() instanceof
+      DataFlowDispatch::LibraryCallableToIncludeInTypeTracking
   )
 }
 
@@ -29,6 +45,12 @@ private predicate viableParam(
 ) {
   exists(DataFlowDispatch::DataFlowCallable callable |
     DataFlowDispatch::getTarget(call) = callable.asCfgScope()
+    or
+    call.asCall().getAstNode() =
+      callable
+          .asLibraryCallable()
+          .(DataFlowDispatch::LibraryCallableToIncludeInTypeTracking)
+          .getACallSimple()
   |
     p.isParameterOf(callable, ppos)
   )
@@ -71,43 +93,64 @@ private module SummaryTypeTrackerInput implements SummaryTypeTracker::Input {
   }
 
   // Summaries and their stacks
-  class SummaryComponent extends Unit {
-    SummaryComponent() { none() }
-  }
+  class SummaryComponent = FlowSummaryImpl::Private::SummaryComponent;
 
-  class SummaryComponentStack extends Unit {
-    SummaryComponent head() { none() }
-  }
+  class SummaryComponentStack = FlowSummaryImpl::Private::SummaryComponentStack;
 
-  SummaryComponentStack singleton(SummaryComponent component) { none() }
+  predicate singleton = FlowSummaryImpl::Private::SummaryComponentStack::singleton/1;
 
-  SummaryComponentStack push(SummaryComponent head, SummaryComponentStack tail) { none() }
+  predicate push = FlowSummaryImpl::Private::SummaryComponentStack::push/2;
 
-  SummaryComponent return() { none() }
+  // Relating content to summaries
+  predicate content = FlowSummaryImpl::Private::SummaryComponent::content/1;
 
-  SummaryComponent content(Content contents) { none() }
+  predicate withoutContent = FlowSummaryImpl::Private::SummaryComponent::withoutContent/1;
 
-  SummaryComponent withoutContent(Content contents) { none() }
+  predicate withContent = FlowSummaryImpl::Private::SummaryComponent::withContent/1;
 
-  SummaryComponent withContent(Content contents) { none() }
+  predicate return = FlowSummaryImpl::Private::SummaryComponent::return/0;
 
-  class SummarizedCallable extends Unit {
-    SummarizedCallable() { none() }
+  // Callables
+  class SummarizedCallable instanceof FlowSummaryImpl::Private::SummarizedCallableImpl {
+    string toString() { result = super.toString() }
 
     predicate propagatesFlow(
       SummaryComponentStack input, SummaryComponentStack output, boolean preservesValue
     ) {
-      none()
+      super.propagatesFlow(input, output, preservesValue, _)
     }
   }
 
-  Node argumentOf(Node call, SummaryComponent arg, boolean isPostUpdate) { none() }
+  // Relating nodes to summaries
+  Node argumentOf(Node call, SummaryComponent arg, boolean isPostUpdate) {
+    exists(DataFlowDispatch::ParameterPosition pos, DataFlowPrivate::ArgumentNode n |
+      arg = FlowSummaryImpl::Private::SummaryComponent::argument(pos) and
+      sourceArgumentPositionMatch(call.asExpr(), n, pos)
+    |
+      isPostUpdate = false and result = n
+      or
+      isPostUpdate = true and result.(DataFlowPublic::PostUpdateNode).getPreUpdateNode() = n
+    )
+  }
 
-  Node parameterOf(Node callable, SummaryComponent param) { none() }
+  Node parameterOf(Node callable, SummaryComponent param) {
+    exists(DataFlowDispatch::ArgumentPosition apos, DataFlowDispatch::ParameterPosition ppos |
+      param = FlowSummaryImpl::Private::SummaryComponent::parameter(apos) and
+      DataFlowDispatch::parameterMatch(ppos, apos) and
+      result.(DataFlowPrivate::ParameterNodeImpl).isSourceParameterOf(callable.asCallable(), ppos)
+    )
+  }
 
-  Node returnOf(Node callable, SummaryComponent return) { none() }
+  Node returnOf(Node callable, SummaryComponent return) {
+    return = FlowSummaryImpl::Private::SummaryComponent::return() and
+    result.(DataFlowPrivate::ReturnNode).(DataFlowPrivate::NodeImpl).getCfgScope() =
+      callable.asCallable()
+  }
 
-  Node callTo(SummarizedCallable callable) { none() }
+  // Relating callables to nodes
+  Node callTo(SummarizedCallable callable) {
+    result.asExpr().getExpr() = callable.(FlowSummary::SummarizedCallable).getACallSimple()
+  }
 }
 
 private module TypeTrackerSummaryFlow = SummaryTypeTracker::SummaryFlow<SummaryTypeTrackerInput>;
@@ -131,7 +174,8 @@ module TypeTrackingInput implements Shared::TypeTrackingInput {
 
     /** Gets the content of a type-tracker that matches this filter. */
     Content getAMatchingContent() {
-      none() // TODO
+      this = MkElementFilter() and
+      result.getAReadContent() instanceof DataFlow::Content::ElementContent
     }
   }
 
diff --git a/powershell/ql/lib/semmlecode.powershell.dbscheme b/powershell/ql/lib/semmlecode.powershell.dbscheme
index 802d5b9f407..c5191f89a6e 100644
--- a/powershell/ql/lib/semmlecode.powershell.dbscheme
+++ b/powershell/ql/lib/semmlecode.powershell.dbscheme
@@ -41,6 +41,10 @@ containerparent(
   unique int child: @container ref
 );
 
+is_in_psmodule_path(
+  int file: @file ref
+);
+
 /* Comments */
 comment_entity(
   unique int id: @comment_entity,
diff --git a/powershell/ql/lib/upgrades/802d5b9f407fb0dac894df1c0b4584f2215e1512/old.dbscheme b/powershell/ql/lib/upgrades/802d5b9f407fb0dac894df1c0b4584f2215e1512/old.dbscheme
new file mode 100644
index 00000000000..802d5b9f407
--- /dev/null
+++ b/powershell/ql/lib/upgrades/802d5b9f407fb0dac894df1c0b4584f2215e1512/old.dbscheme
@@ -0,0 +1,1648 @@
+/* Mandatory */
+sourceLocationPrefix(
+  varchar(900) prefix: string ref
+);
+
+/* Entity Locations */
+@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
+);
+
+/* File Metadata */
+
+numlines(
+  unique int element_id: @file ref,
+  int num_lines: int ref,
+  int num_code: int ref,
+  int num_comment: int ref
+);
+
+files(
+  unique int id: @file,
+  varchar(900) name: string ref
+);
+
+folders(
+  unique int id: @folder,
+  varchar(900) name: string ref
+);
+
+@container = @folder | @file;
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref
+);
+
+/* Comments */
+comment_entity(
+  unique int id: @comment_entity,
+  int text: @string_literal ref
+);
+
+comment_entity_location(
+  unique int id: @comment_entity ref,
+  int loc: @location ref
+);
+
+/* Messages */
+extractor_messages(
+  unique int id: @extractor_message,
+  int severity: int ref,
+  string origin : string ref,
+  string text : string ref,
+  string entity : string ref,
+  int location: @location_default ref,
+  string stack_trace : string ref
+);
+
+parent(
+  int child: @ast ref,
+  int parent: @ast ref
+);
+
+/* AST Nodes */
+// This is all the kinds of nodes that can inherit from Ast
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.ast?view=powershellsdk-7.3.0
+@ast = @not_implemented | @attribute_base | @catch_clause | @command_element |
+@member | @named_block | @param_block | @parameter | @redirection | @script_block | @statement | @statement_block | @named_attribute_argument;
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.attributebaseast?view=powershellsdk-7.2.0
+@attribute_base = @attribute | @type_constraint;
+
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.memberast?view=powershellsdk-7.3.0
+@member = @function_member | @property_member;
+
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.commandbaseast?view=powershellsdk-7.3.0
+@command_base = @command | @command_expression;
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.chainableast?view=powershellsdk-7.3.0
+@chainable = @command_base | @pipeline | @pipeline_chain;
+//https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.pipelinebaseast?view=powershellsdk-7.3.0
+@pipeline_base = @chainable | @error_statement | @assignment_statement;
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.statementast?view=powershellsdk-7.3.0
+@statement = @block_statement 
+| @break_statement 
+| @command_base
+| @configuration_definition 
+| @continue_statement 
+| @data_statement 
+| @dynamic_keyword_statement 
+| @exit_statement 
+| @function_definition 
+| @if_statement 
+| @labeled_statement 
+| @pipeline_base
+| @return_statement 
+| @throw_statement 
+| @trap_statement 
+| @try_statement 
+| @type_definition
+| @using_statement;
+
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.loopstatementast?view=powershellsdk-7.3.0
+@loop_statement = @do_until_statement | @do_while_statement | @foreach_statement | @for_statement | @while_statement;
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.labeledstatementast?view=powershellsdk-7.3.0
+@labeled_statement = @loop_statement | @switch_statement;
+
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.attributedexpressionast?view=powershellsdk-7.3.0
+@attributed_expression_ast = @attributed_expression | @convert_expression;
+
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.memberexpressionast?view=powershellsdk-7.3.0
+@member_expression_base = @member_expression | @invoke_member_expression; // | @base_ctor_invoke_member_expression
+
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.expressionast?view=powershellsdk-7.3.0
+@expression = @array_expression
+| @array_literal
+| @attributed_expression_ast
+| @binary_expression
+| @error_expression
+| @expandable_string_expression
+| @hash_table
+| @index_expression
+| @member_expression_base
+| @paren_expression
+| @script_block_expression
+| @sub_expression
+| @ternary_expression
+| @type_expression
+| @unary_expression
+| @using_expression
+| @variable_expression
+| @base_constant_expression;
+
+// Constant expression can both be instanced and extended by string constant expression
+@base_constant_expression = @constant_expression | @string_constant_expression;
+
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.commandelementast?view=powershellsdk-7.3.0
+@command_element = @expression | @command_parameter;
+
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.redirectionast?view=powershellsdk-7.3.0
+@redirection = @file_redirection | @merging_redirection;
+
+/** 
+Entries in this table indicate visited C# powershell ast objects which don't have parsing implemented yet.  
+
+You can obtain the Type of the C# AST objects which don't yet have an associated entity to parse them
+ using this QL query on an extracted db:
+
+from string s
+where not_implemented(_, s)
+select s
+*/
+not_implemented(
+  unique int id: @not_implemented,
+  string name: string ref
+);
+
+not_implemented_location(
+  int id: @not_implemented ref,
+  int loc: @location ref
+);
+
+// ArrayExpressionAst 
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.arrayexpressionast?view=powershellsdk-7.3.0
+array_expression(
+  unique int id: @array_expression,
+  int subExpression: @statement_block ref
+)
+
+array_expression_location(
+  int id: @array_expression ref,
+  int loc: @location ref
+)
+
+// ArrayLiteralAst 
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.arrayliteralast?view=powershellsdk-7.3.0
+array_literal(
+  unique int id: @array_literal
+)
+
+array_literal_location(
+  int id: @array_literal ref,
+  int loc: @location ref
+)
+
+array_literal_element(
+  int id: @array_literal ref,
+  int index: int ref,
+  int component: @expression ref
+)
+
+// AssignmentStatementAst 
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.assignmentstatementast?view=powershellsdk-7.3.0
+// https://github.com/PowerShell/PowerShell/blob/48c9d683565ed9402430a27e09410d56d52d4bfd/src/System.Management.Automation/engine/parser/Compiler.cs#L983-L989
+assignment_statement(
+  unique int id: @assignment_statement,
+  int kind: int ref, // @token_kind ref
+  int left: @expression ref,
+  int right: @statement ref
+)
+
+assignment_statement_location(
+  int id: @assignment_statement ref,
+  int loc: @location ref
+)
+
+// NamedBlockAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.namedblockast?view=powershellsdk-7.3.0
+named_block(
+  unique int id: @named_block,
+  int numStatements: int ref,
+  int numTraps: int ref
+)
+
+named_block_statement(
+  int id: @named_block ref,
+  int index: int ref,
+  int statement: @statement ref
+)
+
+named_block_trap(
+  int id: @named_block ref,
+  int index: int ref,
+  int trap: @trap_statement ref
+)
+
+named_block_location(
+  int id: @named_block ref,
+  int loc: @location ref
+)
+
+// ScriptBlockAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.scriptblockast?view=powershellsdk-7.3.0
+script_block(
+  unique int id: @script_block,
+  int numUsings: int ref,
+  int numRequiredModules: int ref,
+  int numRequiredAssemblies: int ref,
+  int numRequiredPsEditions: int ref,
+  int numRequiredPsSnapins: int ref
+)
+
+script_block_param_block(
+  int id: @script_block ref,
+  int the_param_block: @param_block ref
+)
+
+script_block_begin_block(
+  int id: @script_block ref,
+  int begin_block: @named_block ref
+)
+
+script_block_clean_block(
+  int id: @script_block ref,
+  int clean_block: @named_block ref
+)
+
+script_block_dynamic_param_block(
+  int id: @script_block ref,
+  int dynamic_param_block: @named_block ref
+)
+
+script_block_end_block(
+  int id: @script_block ref,
+  int end_block: @named_block ref
+)
+
+script_block_process_block(
+  int id: @script_block ref,
+  int process_block: @named_block ref
+)
+
+script_block_using(
+  int id: @script_block ref,
+  int index: int ref,
+  int using: @ast ref
+)
+
+script_block_required_application_id(
+  int id: @script_block ref,
+  string application_id: string ref
+)
+
+script_block_requires_elevation(
+  int id: @script_block ref,
+  boolean requires_elevation: boolean ref
+)
+
+script_block_required_ps_version(
+  int id: @script_block ref,
+  string required_ps_version: string ref
+)
+
+script_block_required_module(
+  int id: @script_block ref,
+  int index: int ref,
+  int required_module: @module_specification ref
+)
+
+script_block_required_assembly(
+  int id: @script_block ref,
+  int index: int ref,
+  string required_assembly: string ref
+)
+
+script_block_required_ps_edition(
+  int id: @script_block ref,
+  int index: int ref,
+  string required_ps_edition: string ref
+)
+
+script_block_requires_ps_snapin(
+  int id: @script_block ref,
+  int index: int ref,
+  string name: string ref,
+  string version: string ref
+)
+
+script_block_location(
+  int id: @script_block ref,
+  int loc: @location ref
+)
+
+// ModuleSpecification
+// https://learn.microsoft.com/en-us/dotnet/api/microsoft.powershell.commands.modulespecification?view=powershellsdk-7.3.0
+module_specification(
+  unique int id: @module_specification,
+  string name: string ref,
+  string guid: string ref,
+  string maxVersion: string ref,
+  string requiredVersion: string ref,
+  string version: string ref
+)
+
+// BinaryExpressionAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.binaryexpressionast?view=powershellsdk-7.3.0
+// https://github.com/PowerShell/PowerShell/blob/48c9d683565ed9402430a27e09410d56d52d4bfd/src/System.Management.Automation/engine/parser/Compiler.cs#L5675-L5947
+binary_expression(
+  unique int id: @binary_expression,
+  int kind: int ref, // @token_kind ref
+  int left: @expression ref,
+  int right: @expression ref
+)
+
+// @binary_expression_kind = @And | @Is | @IsNot | @As | @DotDot | @Multiply | @Divide | @Rem | @Plus | @Minus | @Format | @Xor | @Shl | @Shr | @Band | @Bor | @Bxor | @Join | @Ieq | @Ine | @Ige | @Igt | @Ilt | @Ile | @Ilike | @Inotlike | @Inotmatch | @Imatch | @Ireplace | @Inotcontains | @Icontains | @Iin | @Inotin | @Isplit | @Ceq | @Cge | @Cgt | @Clt | @Cle | @Clike | @Cnotlike | @Cnotmatch | @Cmatch | @Ccontains | @Creplace | @Cin | @Cnotin | @Csplit | @QuestionQuestion;
+
+binary_expression_location(
+  int id: @binary_expression ref,
+  int loc: @location ref
+)
+
+// ConstantExpressionAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.constantexpressionast?view=powershellsdk-7.3.0
+constant_expression(
+  unique int id: @constant_expression,
+  string staticType: string ref
+)
+
+constant_expression_value(
+  int id: @constant_expression ref,
+  int value: @string_literal ref
+)
+
+constant_expression_location(
+  int id: @constant_expression ref,
+  int loc: @location ref
+)
+
+// ConvertExpressionAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.convertexpressionast?view=powershellsdk-7.3.0
+convert_expression(
+  unique int id: @convert_expression,
+  int the_attribute: @ast ref,
+  int child: @ast ref,
+  int object_type: @ast ref,
+  string staticType: string ref
+)
+
+convert_expression_location(
+  int id: @convert_expression ref,
+  int loc: @location ref
+)
+
+// IndexExpressionAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.indexexpressionast?view=powershellsdk-7.3.0
+index_expression(
+  unique int id: @index_expression,
+  int index: @ast ref,
+  int target: @ast ref,
+  boolean nullConditional: boolean ref
+)
+
+index_expression_location(
+  int id: @index_expression ref,
+  int loc: @location ref
+)
+
+// IfStatementAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.ifstatementast?view=powershellsdk-7.3.0
+if_statement(
+  unique int id: @if_statement
+)
+
+if_statement_clause(
+  int id: @if_statement ref,
+  int index: int ref,
+  int item1: @pipeline_base ref,
+  int item2: @statement_block ref
+)
+
+if_statement_else(
+  int id: @if_statement ref,
+  int elseItem: @statement_block ref 
+)
+
+if_statement_location(
+  int id: @if_statement ref,
+  int loc: @location ref
+)
+
+// MemberExpressionAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.memberexpressionast?view=powershellsdk-7.3.0
+member_expression(
+  unique int id: @member_expression,
+  int expression: @ast ref,
+  int member: @ast ref,
+  boolean nullConditional: boolean ref,
+  boolean isStatic: boolean ref
+)
+
+member_expression_location(
+  int id: @member_expression ref,
+  int loc: @location ref
+)
+
+// StatementBlockAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.statementblockast?view=powershellsdk-7.3.0
+statement_block(
+  unique int id: @statement_block,
+  int numStatements: int ref,
+  int numTraps : int ref
+)
+
+statement_block_location(
+  int id: @statement_block ref,
+  int loc: @location ref
+)
+
+statement_block_statement(
+  int id: @statement_block ref,
+  int index: int ref,
+  int statement: @statement ref
+)
+
+statement_block_trap(
+  int id: @statement_block ref,
+  int index: int ref,
+  int trap: @trap_statement ref
+)
+
+// SubExpressionAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.subexpressionast?view=powershellsdk-7.3.0
+sub_expression(
+  unique int id: @sub_expression,
+  int subExpression: @statement_block ref
+)
+
+sub_expression_location(
+  int id: @sub_expression ref,
+  int loc: @location ref
+)
+
+// VariableExpressionAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.variableexpressionast?view=powershellsdk-7.3.0
+variable_expression(
+  unique int id: @variable_expression,
+  string userPath: string ref,
+  string driveName: string ref,
+  boolean isConstant: boolean ref,
+  boolean isGlobal: boolean ref,
+  boolean isLocal: boolean ref,
+  boolean isPrivate: boolean ref,
+  boolean isScript: boolean ref,
+  boolean isUnqualified: boolean ref,
+  boolean isUnscoped: boolean ref,
+  boolean isVariable: boolean ref,
+  boolean isDriveQualified: boolean ref
+)
+
+variable_expression_location(
+  int id: @variable_expression ref,
+  int loc: @location ref
+)
+
+// CommandExpressionAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.commandexpressionast?view=powershellsdk-7.3.0
+command_expression(
+  unique int id: @command_expression,
+  int wrapped: @expression ref,
+  int numRedirections: int ref
+)
+
+command_expression_location(
+  int id: @command_expression ref,
+  int loc: @location ref
+)
+
+command_expression_redirection(
+  int id: @command_expression ref,
+  int index: int ref,
+  int redirection: @redirection ref
+)
+
+// StringConstantExpressionAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.stringconstantexpressionast?view=powershellsdk-7.3.0
+string_constant_expression(
+  unique int id: @string_constant_expression,
+  int value: @string_literal ref
+)
+
+string_constant_expression_location(
+  int id: @string_constant_expression ref,
+  int loc: @location ref
+)
+
+// PipelineAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.pipelineast?view=powershellsdk-7.3.0
+pipeline(
+  unique int id: @pipeline,
+  int numComponents: int ref
+)
+
+pipeline_location(
+  int id: @pipeline ref,
+  int loc: @location ref
+)
+
+pipeline_component(
+  int id: @pipeline ref,
+  int index: int ref,
+  int component: @command_base ref
+)
+
+// CommandAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.commandast?view=powershellsdk-7.3.0
+command(
+  unique int id: @command,
+  string name: string ref,
+  int kind: int ref, // @token_kind ref
+  int numElements: int ref,
+  int numRedirections: int ref
+)
+
+command_location(
+  int id: @command ref,
+  int loc: @location ref
+)
+
+command_command_element(
+  int id: @command ref,
+  int index: int ref,
+  int component: @command_element ref
+)
+
+command_redirection(
+  int id: @command ref,
+  int index: int ref,
+  int redirection: @redirection ref
+)
+
+// InvokeMemberExpressionAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.invokememberexpressionast?view=powershellsdk-7.3.0
+invoke_member_expression(
+  unique int id: @invoke_member_expression,
+  int expression: @expression ref,
+  int member: @command_element ref
+)
+
+invoke_member_expression_location(
+  int id: @invoke_member_expression ref,
+  int loc: @location ref
+)
+
+invoke_member_expression_argument(
+  int id: @invoke_member_expression ref,
+  int index: int ref,
+  int argument: @expression ref
+)
+
+// ParenExpressionAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.parenexpressionast?view=powershellsdk-7.3.0
+paren_expression(
+  unique int id: @paren_expression,
+  int expression: @pipeline_base ref
+)
+
+paren_expression_location(
+  int id: @paren_expression ref,
+  int loc: @location ref
+)
+
+
+// TernaryStatementAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.ternaryexpressionast?view=powershellsdk-7.3.0
+ternary_expression(
+  unique int id: @ternary_expression, 
+  int condition: @expression ref,
+  int ifFalse: @expression ref,
+  int iftrue: @expression ref
+)
+
+ternary_expression_location(
+  int id: @ternary_expression ref,
+  int loc: @location ref
+)
+
+// ExitStatementAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.exitstatementast?view=powershellsdk-7.3.0
+exit_statement(
+  unique int id: @exit_statement
+)
+
+exit_statement_pipeline(
+  int id: @exit_statement ref,
+  int expression: @pipeline_base ref
+)
+
+exit_statement_location(
+  int id: @exit_statement ref,
+  int loc: @location ref
+)
+
+
+// TypeExpressionAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.typeexpressionast?view=powershellsdk-7.3.0
+type_expression(
+  unique int id: @type_expression,
+  string name: string ref,
+  string fullName: string ref
+)
+
+type_expression_location(
+  int id: @type_expression ref,
+  int loc: @location ref
+)
+
+// CommandParameterAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.commandparameterast?view=powershellsdk-7.3.0
+command_parameter(
+  unique int id: @command_parameter,
+  string name: string ref
+)
+
+command_parameter_location(
+  int id: @command_parameter ref,
+  int loc: @location ref
+)
+
+command_parameter_argument(
+  int id: @command_parameter ref,
+  int argument: @ast ref
+)
+
+// NamedAttributeArgumentAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.namedattributeargumentast?view=powershellsdk-7.3.0
+named_attribute_argument(
+  unique int id: @named_attribute_argument,
+  string name: string ref,
+  int argument: @expression ref
+)
+
+named_attribute_argument_location(
+  int id: @named_attribute_argument ref,
+  int loc: @location ref
+)
+
+// AttributeAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.attributeast?view=powershellsdk-7.3.0
+attribute(
+  unique int id: @attribute,
+  string name: string ref,
+  int numNamedArguments: int ref,
+  int numPositionalArguments: int ref
+)
+
+attribute_named_argument(
+  int id: @attribute ref,
+  int index: int ref,
+  int argument: @named_attribute_argument ref
+)
+
+attribute_positional_argument(
+  int id: @attribute ref,
+  int index: int ref,
+  int argument: @expression ref
+)
+
+attribute_location(
+  int id: @attribute ref,
+  int id: @location ref
+)
+
+// ParamBlockAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.paramblockast?view=powershellsdk-7.3.0
+param_block(
+  unique int id: @param_block,
+  int numAttributes: int ref,
+  int numParameters: int ref
+)
+
+param_block_attribute(
+  int id: @param_block ref,
+  int index: int ref,
+  int the_attribute: @attribute ref
+)
+
+param_block_parameter(
+  int id: @param_block ref,
+  int index: int ref,
+  int the_parameter: @parameter ref
+)
+
+param_block_location(
+  int id: @param_block ref,
+  int id: @location ref
+)
+
+// ParameterAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.parameterast?view=powershellsdk-7.3.0
+parameter(
+  unique int id: @parameter,
+  int name: @variable_expression ref,
+  string staticType: string ref,
+  int numAttributes: int ref
+)
+
+parameter_attribute(
+  int id: @parameter ref,
+  int index: int ref,
+  int the_attribute: @attribute_base ref
+)
+
+parameter_location(
+  int id: @parameter ref,
+  int loc: @location ref
+)
+
+parameter_default_value(
+  int id: @parameter ref,
+  int default_value: @expression ref
+)
+
+// TypeConstraintAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.typeconstraintast?view=powershellsdk-7.3.0
+type_constraint(
+  unique int id: @type_constraint,
+  string name: string ref,
+  string fullName: string ref
+)
+
+type_constraint_location(
+  int id: @type_constraint ref,
+  int loc: @location ref
+)
+
+// FunctionDefinitionAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.functiondefinitionast?view=powershellsdk-7.3.0
+function_definition(
+  unique int id: @function_definition,
+  int body: @script_block ref,
+  string name: string ref,
+  boolean isFilter: boolean ref,
+  boolean isWorkflow: boolean ref
+)
+
+function_definition_parameter(
+  int id: @function_definition ref,
+  int index: int ref,
+  int parameter: @parameter ref
+)
+
+function_definition_location(
+  int id: @function_definition ref,
+  int loc: @location ref
+)
+
+// BreakStatementAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.breakstatementast?view=powershellsdk-7.3.0
+break_statement(
+  unique int id: @break_statement
+)
+
+break_statement_location(
+  int id: @break_statement ref,
+  int loc: @location ref
+)
+
+// ContinueStatementAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.continuestatementast?view=powershellsdk-7.3.0
+continue_statement(
+  unique int id: @continue_statement
+)
+
+continue_statement_location(
+  int id: @continue_statement ref,
+  int loc: @location ref
+)
+@labelled_statement = @continue_statement | @break_statement;
+
+statement_label(
+  int id: @labelled_statement ref,
+  int label: @expression ref
+)
+
+// ReturnStatementAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.returnstatementast?view=powershellsdk-7.3.0
+return_statement(
+  unique int id: @return_statement
+)
+
+return_statement_pipeline(
+  int id: @return_statement ref,
+  int pipeline: @pipeline_base ref
+)
+
+return_statement_location(
+  int id: @return_statement ref,
+  int loc: @location ref
+)
+
+// DoWhileStatementAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.dowhilestatementast?view=powershellsdk-7.3.0
+do_while_statement(
+  unique int id: @do_while_statement,
+  int body: @statement_block ref
+)
+
+do_while_statement_condition(
+  int id: @do_while_statement ref,
+  int condition: @pipeline_base ref
+)
+
+do_while_statement_location(
+  int id: @do_while_statement ref,
+  int loc: @location ref
+)
+
+// DoUntilStatementAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.dountilstatementast?view=powershellsdk-7.3.0
+do_until_statement(
+  unique int id: @do_until_statement,
+  int body: @statement_block ref
+)
+
+do_until_statement_condition(
+  int id: @do_until_statement ref,
+  int condition: @pipeline_base ref
+)
+
+do_until_statement_location(
+  int id: @do_until_statement ref,
+  int loc: @location ref
+)
+
+// WhileStatementAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.whilestatementast?view=powershellsdk-7.3.0
+while_statement(
+  unique int id: @while_statement,
+  int body: @statement_block ref
+)
+
+while_statement_condition(
+  int id: @while_statement ref,
+  int condition: @pipeline_base ref
+)
+
+while_statement_location(
+  int id: @while_statement ref,
+  int loc: @location ref
+)
+
+// ForEachStatementAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.foreachstatementast?view=powershellsdk-7.3.0
+foreach_statement(
+  unique int id: @foreach_statement,
+  int variable: @variable_expression ref,
+  int condition: @pipeline_base ref,
+  int body: @statement_block ref,
+  int flags: int ref
+)
+
+foreach_statement_location(
+  int id: @foreach_statement ref,
+  int loc: @location ref
+)
+
+// ForStatementAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.forstatementast?view=powershellsdk-7.3.0
+for_statement(
+  unique int id: @for_statement,
+  int body: @statement_block ref
+)
+
+for_statement_location(
+  int id: @for_statement ref,
+  int loc: @location ref
+)
+
+for_statement_condition(
+  int id: @for_statement ref,
+  int condition: @pipeline_base ref
+)
+
+for_statement_initializer(
+  int id: @for_statement ref,
+  int initializer: @pipeline_base ref
+)
+
+for_statement_iterator(
+  int id: @for_statement ref,
+  int iterator: @pipeline_base ref
+)
+
+// ExpandableStringExpressionAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.expandablestringexpressionast?view=powershellsdk-7.3.0
+expandable_string_expression(
+  unique int id: @expandable_string_expression,
+  int value: @string_literal ref,
+  int kind: int ref,
+  int numExpression: int ref
+)
+
+case @expandable_string_expression.kind of
+ 4 = @BareWord
+| 2 = @DoubleQuoted
+| 3 = @DoubleQuotedHereString
+| 0 = @SingleQuoted
+| 1 = @SingleQuotedHereString;
+
+expandable_string_expression_location(
+  int id: @expandable_string_expression ref,
+  int loc: @location ref
+)
+
+expandable_string_expression_nested_expression(
+  int id: @expandable_string_expression ref,
+  int index: int ref,
+  int nestedExression: @expression ref
+)
+
+// StringLiterals
+// Contains string literals broken into lines to prevent breaks in the trap from multiline strings
+string_literal(
+  unique int id: @string_literal
+)
+
+string_literal_location(
+  int id: @string_literal ref,
+  int loc: @location ref
+)
+
+string_literal_line(
+  int id: @string_literal ref,
+  int lineNum: int ref,
+  string line: string ref
+)
+
+// UnaryExpressionAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.unaryexpressionast?view=powershellsdk-7.3.0
+unary_expression(
+  unique int id: @unary_expression,
+  int child: @ast ref,
+  int kind: int ref,
+  string staticType: string ref
+)
+
+unary_expression_location(
+  int id: @unary_expression ref,
+  int loc: @location ref
+)
+
+// CatchClauseAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.catchclauseast?view=powershellsdk-7.3.0
+catch_clause(
+  unique int id: @catch_clause,
+  int body: @statement_block ref,
+  boolean isCatchAll: boolean ref
+)
+
+catch_clause_catch_type(
+  int id: @catch_clause ref,
+  int index: int ref,
+  int catch_type: @type_constraint ref
+)
+
+catch_clause_location(
+  int id: @catch_clause ref,
+  int loc: @location ref
+)
+
+// ThrowStatementAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.throwstatementast?view=powershellsdk-7.3.0
+throw_statement(
+  unique int id: @throw_statement,
+  boolean isRethrow: boolean ref
+)
+
+throw_statement_location(
+  int id: @throw_statement ref,
+  int loc: @location ref
+)
+
+throw_statement_pipeline(
+  int id: @throw_statement ref,
+  int pipeline: @ast ref
+)
+
+// TryStatementAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.trystatementast?view=powershellsdk-7.3.0
+try_statement(
+  unique int id: @try_statement,
+  int body: @statement_block ref
+)
+
+try_statement_catch_clause(
+  int id: @try_statement ref,
+  int index: int ref,
+  int catch_clause: @catch_clause ref
+)
+
+
+try_statement_finally(
+  int id: @try_statement ref,
+  int finally: @ast ref
+)
+
+try_statement_location(
+  int id: @try_statement ref,
+  int loc: @location ref
+)
+
+// FileRedirectionAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.fileredirectionast?view=powershellsdk-7.3.0
+file_redirection(
+  unique int id: @file_redirection,
+  int location: @ast ref,
+  boolean isAppend: boolean ref,
+  int redirectionType: int ref
+)
+
+case @file_redirection.redirectionType of
+ 0 = @All
+| 1 = @Output
+| 2 = @Error
+| 3 = @Warning
+| 4 = @Verbose
+| 5 = @Debug
+| 6 = @Information;
+
+file_redirection_location(
+  int id: @file_redirection ref,
+  int loc: @location ref
+)
+
+// BlockStatementAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.blockstatementast?view=powershellsdk-7.3.0
+block_statement(
+  unique int id: @block_statement,
+  int body: @ast ref,
+  int token: @token ref
+)
+
+block_statement_location(
+  int id: @block_statement ref,
+  int loc: @location ref
+)
+
+// Token
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.token?view=powershellsdk-7.3.0
+token(
+  unique int id: @token,
+  boolean hasError: boolean ref,
+  int kind: int ref,
+  string text: string ref,
+  int tokenFlags: int ref
+)
+
+token_location(
+  int id: @token ref,
+  int loc: @location ref
+)
+
+// ConfigurationDefinitionAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.configurationdefinitionast?view=powershellsdk-7.3.0
+configuration_definition(
+  unique int id: @configuration_definition,
+  int body: @script_block_expression ref,
+  int configurationType: int ref,
+  int name: @expression ref
+)
+
+configuration_definition_location(
+  int id: @configuration_definition ref,
+  int loc: @location ref
+)
+
+// DataStatementAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.datastatementast?view=powershellsdk-7.3.0
+data_statement(
+  unique int id: @data_statement,
+  int body: @statement_block ref
+)
+
+data_statement_variable(
+  int id: @data_statement ref,
+  string variable: string ref
+)
+
+data_statement_commands_allowed(
+  int id: @data_statement ref,
+  int index: int ref,
+  int command_allowed: @ast ref
+)
+
+data_statement_location(
+  int id: @data_statement ref,
+  int loc: @location ref
+)
+
+// DynamicKeywordStatementAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.dynamickeywordstatementast?view=powershellsdk-7.3.0
+dynamic_keyword_statement(
+  unique int id: @dynamic_keyword_statement
+)
+
+dynamic_keyword_statement_command_elements(
+  int id: @dynamic_keyword_statement ref,
+  int index: int ref,
+  int element: @command_element ref
+)
+
+dynamic_keyword_statement_location(
+  int id: @dynamic_keyword_statement ref,
+  int loc: @location ref
+)
+
+// ErrorExpressionAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.errorexpressionast?view=powershellsdk-7.3.0
+error_expression(
+  unique int id: @error_expression
+)
+
+error_expression_nested_ast(
+  int id: @error_expression ref,
+  int index: int ref,
+  int nested_ast: @ast ref
+)
+
+error_expression_location(
+  int id: @error_expression ref,
+  int loc: @location ref
+)
+
+// ErrorStatementAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.errorstatementast?view=powershellsdk-7.3.0
+error_statement(
+  unique int id: @error_statement,
+  int token: @token ref
+)
+
+error_statement_location(
+  int id: @error_statement ref,
+  int loc: @location ref
+)
+
+error_statement_nested_ast(
+  int id: @error_statement ref,
+  int index: int ref,
+  int nested_ast: @ast ref
+)
+
+error_statement_conditions(
+  int id: @error_statement ref,
+  int index: int ref,
+  int condition: @ast ref
+)
+
+error_statement_bodies(
+  int id: @error_statement ref,
+  int index: int ref,
+  int body: @ast ref
+)
+
+error_statement_flag(
+  int id: @error_statement ref,
+  int index: int ref,
+  int k: string ref, // The key
+  int token: @token ref, // These two form a tuple of the value
+  int ast: @ast ref
+)
+
+// FunctionMemberAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.functionmemberast?view=powershellsdk-7.3.0
+function_member(
+  unique int id: @function_member,
+  int body: @ast ref,
+  boolean isConstructor: boolean ref,
+  boolean isHidden: boolean ref,
+  boolean isPrivate: boolean ref,
+  boolean isPublic: boolean ref,
+  boolean isStatic: boolean ref,
+  string name: string ref,
+  int methodAttributes: int ref
+)
+
+function_member_location(
+  int id: @function_member ref,
+  int loc: @location ref
+)
+
+function_member_parameter(
+  int id: @function_member ref,
+  int index: int ref,
+  int parameter: @ast ref
+)
+
+function_member_attribute(
+  int id: @function_member ref,
+  int index: int ref,
+  int attribute: @ast ref
+)
+
+function_member_return_type(
+  int id: @function_member ref,
+  int return_type: @type_constraint ref
+)
+
+// MergingRedirectionAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.mergingredirectionast?view=powershellsdk-7.3.0
+merging_redirection(
+  unique int id: @merging_redirection,
+  int from: int ref,
+  int to: int ref
+)
+
+merging_redirection_location(
+  int id: @merging_redirection ref,
+  int loc: @location ref
+)
+
+
+label(
+  int id: @labeled_statement ref,
+  string label: string ref
+)
+
+// TrapStatementAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.trapstatementast?view=powershellsdk-7.3.0
+trap_statement(
+  unique int id: @trap_statement,
+  int body: @ast ref
+)
+
+trap_statement_type(
+  int id: @trap_statement ref,
+  int trap_type: @type_constraint ref
+)
+
+trap_statement_location(
+  int id: @trap_statement ref,
+  int loc: @location ref
+)
+
+// PipelineChainAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.pipelinechainast?view=powershellsdk-7.3.0
+pipeline_chain(
+  unique int id: @pipeline_chain,
+  boolean isBackground: boolean ref,
+  int kind: int ref,
+  int left: @ast ref,
+  int right: @ast ref
+)
+
+pipeline_chain_location(
+  int id: @pipeline_chain ref,
+  int loc: @location ref
+)
+
+// PropertyMemberAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.propertymemberast?view=powershellsdk-7.3.0
+property_member(
+  unique int id: @property_member,
+  boolean isHidden: boolean ref,
+  boolean isPrivate: boolean ref,
+  boolean isPublic: boolean ref,
+  boolean isStatic: boolean ref,
+  string name: string ref,
+  int methodAttributes: int ref
+)
+
+property_member_attribute(
+  int id: @property_member ref,
+  int index: int ref,
+  int attribute: @ast ref
+)
+
+property_member_property_type(
+  int id: @property_member ref,
+  int property_type: @type_constraint ref
+)
+
+property_member_initial_value(
+  int id: @property_member ref,
+  int initial_value: @ast ref
+)
+
+property_member_location(
+  int id: @property_member ref,
+  int loc: @location ref
+)
+
+// ScriptBlockExpressionAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.scriptblockexpressionast?view=powershellsdk-7.3.0
+script_block_expression(
+  unique int id: @script_block_expression,
+  int body: @script_block ref
+)
+
+script_block_expression_location(
+  int id: @script_block_expression ref,
+  int loc: @location ref
+)
+
+// SwitchStatementAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.switchstatementast?view=powershellsdk-7.3.0
+switch_statement(
+  unique int id: @switch_statement,
+  int condition: @ast ref,
+  int flags: int ref
+)
+
+switch_statement_clauses(
+  int id: @switch_statement ref,
+  int index: int ref,
+  int expression: @ast ref,
+  int statementBlock: @ast ref
+)
+
+switch_statement_location(
+  int id: @switch_statement ref,
+  int loc: @location ref
+)
+
+switch_statement_default(
+  int id: @switch_statement ref,
+  int default: @ast ref
+)
+
+// TypeDefinitionAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.typedefinitionast?view=powershellsdk-7.3.0
+type_definition(
+  unique int id: @type_definition,
+  string name: string ref,
+  int flags: int ref,
+  boolean isClass: boolean ref,
+  boolean isEnum: boolean ref,
+  boolean isInterface: boolean ref
+)
+
+type_definition_attributes(
+  int id: @type_definition ref,
+  int index: int ref,
+  int attribute: @ast ref
+)
+
+type_definition_members(
+  int id: @type_definition ref,
+  int index: int ref,
+  int member: @ast ref
+)
+
+type_definition_location(
+  int id: @type_definition ref,
+  int loc: @location ref
+)
+
+type_definition_base_type(
+  int id: @type_definition ref,
+  int index: int ref,
+  int base_type: @type_constraint ref
+)
+
+// UsingExpressionAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.usingexpressionast?view=powershellsdk-7.3.0
+using_expression(
+  unique int id: @using_expression,
+  int subExpression: @ast ref
+)
+
+using_expression_location(
+  int id: @using_expression ref,
+  int loc: @location ref
+)
+
+// UsingStatementAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.usingstatementast?view=powershellsdk-7.3.0
+using_statement(
+  unique int id: @using_statement,
+  int kind: int ref
+)
+
+using_statement_location(
+  int id: @using_statement ref,
+  int loc: @location ref
+)
+
+using_statement_alias(
+  int id: @using_statement ref,
+  int alias: @ast ref
+)
+
+using_statement_module_specification(
+  int id: @using_statement ref,
+  int module_specification: @ast ref
+)
+
+using_statement_name(
+  int id: @using_statement ref,
+  int name: @ast ref
+)
+
+// HashTableAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.hashtableast?view=powershellsdk-7.3.0
+hash_table(
+  unique int id: @hash_table
+)
+
+hash_table_location(
+  int id: @hash_table ref,
+  int loc: @location ref
+)
+
+hash_table_key_value_pairs(
+  int id: @hash_table ref,
+  int index: int ref,
+  int k: @ast ref,
+  int v: @ast ref
+)
+
+// AttributedExpressionAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.attributedexpressionast?view=powershellsdk-7.3.0
+attributed_expression(
+  unique int id: @attributed_expression,
+  int attribute: @ast ref,
+  int expression: @ast ref
+)
+
+attributed_expression_location(
+  int id: @attributed_expression ref,
+  int loc: @location ref
+)
+
+// TokenKind
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.tokenkind?view=powershellsdk-7.3.0
+token_kind_reference(
+  unique int id: @token_kind_reference,
+  string name: string ref,
+  int kind: int ref
+)
+
+@token_kind = @ampersand | @and | @andAnd | @as | @assembly | @atCurly | @atParen | @band | @base | @begin | @bnot | @bor | @break 
+| @bxor | @catch | @ccontains | @ceq | @cge | @cgt | @cin | @class | @cle | @clean | @clike | @clt | @cmatch | @cne | @cnotcontains 
+| @cnotin | @cnotlike | @cnotmatch | @colon | @colonColon | @comma | @command_token | @comment | @configuration | @continue | @creplace 
+| @csplit | @data | @default | @define | @divide | @divideEquals | @do | @dollarParen | @dot | @dotDot | @dynamicKeyword | @dynamicparam 
+| @else | @elseIf | @end | @endOfInput | @enum | @equals | @exclaim | @exit | @filter | @finally | @for | @foreach | @format | @from 
+| @function | @generic | @hereStringExpandable | @hereStringLiteral | @hidden | @icontains | @identifier | @ieq | @if | @ige | @igt 
+| @iin | @ile | @ilike | @ilt | @imatch | @in | @ine | @inlineScript | @inotcontains | @inotin | @inotlike | @inotmatch | @interface 
+| @ireplace | @is | @isNot | @isplit | @join | @label | @lBracket | @lCurly | @lineContinuation | @lParen | @minus | @minusEquals 
+| @minusMinus | @module | @multiply | @multiplyEquals | @namespace | @newLine | @not | @number | @or | @orOr | @parallel | @param 
+| @parameter_token | @pipe | @plus | @plusEquals | @plusPlus | @postfixMinusMinus | @postfixPlusPlus | @private | @process | @public 
+| @questionDot | @questionLBracket | @questionMark | @questionQuestion | @questionQuestionEquals | @rBracket | @rCurly | @redirectInStd 
+| @redirection_token | @rem | @remainderEquals | @return | @rParen | @semi | @sequence | @shl | @shr | @splattedVariable | @static 
+| @stringExpandable | @stringLiteral_token | @switch | @throw | @trap | @try | @type | @unknown | @until | @using | @var | @variable 
+| @while | @workflow | @xor;
+
+case @token_kind_reference.kind of
+28 = @ampersand // The invocation operator '&'.
+| 53 = @and // The logical and operator '-and'.
+| 26 = @andAnd // The (unimplemented) operator '&&'.
+| 94 = @as // The type conversion operator '-as'.
+| 165 = @assembly // The 'assembly' keyword
+| 23 = @atCurly // The opening token of a hash expression '@{'.
+| 22 = @atParen // The opening token of an array expression '@('.
+| 56 = @band // The bitwise and operator '-band'.
+| 168 = @base // The 'base' keyword
+| 119 = @begin // The 'begin' keyword.
+| 52 = @bnot // The bitwise not operator '-bnot'.
+| 57 = @bor // The bitwise or operator '-bor'.
+| 120 = @break // The 'break' keyword.
+| 58 = @bxor // The bitwise exclusive or operator '-xor'.
+| 121 = @catch // The 'catch' keyword.
+| 87 = @ccontains // The case sensitive contains operator '-ccontains'.
+| 76 = @ceq // The case sensitive equal operator '-ceq'.
+| 78 = @cge // The case sensitive greater than or equal operator '-cge'.
+| 79 = @cgt // The case sensitive greater than operator '-cgt'.
+| 89 = @cin // The case sensitive in operator '-cin'.
+| 122 = @class // The 'class' keyword.
+| 81 = @cle // The case sensitive less than or equal operator '-cle'.
+| 170 = @clean // The 'clean' keyword.
+| 82 = @clike // The case sensitive like operator '-clike'.
+| 80 = @clt // The case sensitive less than operator '-clt'.
+| 84 = @cmatch // The case sensitive match operator '-cmatch'.
+| 77 = @cne // The case sensitive not equal operator '-cne'.
+| 88 = @cnotcontains // The case sensitive not contains operator '-cnotcontains'.
+| 90 = @cnotin // The case sensitive not in operator '-notin'.
+| 83 = @cnotlike // The case sensitive notlike operator '-cnotlike'.
+| 85 = @cnotmatch // The case sensitive not match operator '-cnotmatch'.
+| 99 = @colon // The PS class base class and implemented interfaces operator ':'. Also used in base class ctor calls.
+| 34 = @colonColon // The static member access operator '::'.
+| 30 = @comma // The unary or binary array operator ','.
+| 166 = @command_token // The 'command' keyword
+| 10 = @comment // A single line comment, or a delimited comment.
+| 155 = @configuration // The "configuration" keyword
+| 123 = @continue // The 'continue' keyword.
+| 86 = @creplace // The case sensitive replace operator '-creplace'.
+| 91 = @csplit // The case sensitive split operator '-csplit'.
+| 124 = @data // The 'data' keyword.
+| 169 = @default // The 'default' keyword
+| 125 = @define // The (unimplemented) 'define' keyword.
+| 38 = @divide // The division operator '/'.
+| 46 = @divideEquals // The division assignment operator '/='.
+| 126 = @do // The 'do' keyword.
+| 24 = @dollarParen // The opening token of a sub-expression '$('.
+| 35 = @dot // The instance member access or dot source invocation operator '.'.
+| 33 = @dotDot // The range operator '..'.
+| 156 = @dynamicKeyword // The token kind for dynamic keywords
+| 127 = @dynamicparam // The 'dynamicparam' keyword.
+| 128 = @else // The 'else' keyword.
+| 129 = @elseIf // The 'elseif' keyword.
+| 130 = @end // The 'end' keyword.
+| 11 = @endOfInput // Marks the end of the input script or file.
+| 161 = @enum // The 'enum' keyword
+| 42 = @equals // The assignment operator '='.
+| 36 = @exclaim // The logical not operator '!'.
+| 131 = @exit // The 'exit' keyword.
+| 132 = @filter // The 'filter' keyword.
+| 133 = @finally // The 'finally' keyword.
+| 134 = @for // The 'for' keyword.
+| 135 = @foreach // The 'foreach' keyword.
+| 50 = @format // The string format operator '-f'.
+| 136 = @from // The (unimplemented) 'from' keyword.
+| 137 = @function // The 'function' keyword.
+| 7 = @generic // A token that is only valid as a command name, command argument, function name, or configuration name. It may contain characters not allowed in identifiers. Tokens with this kind are always instances of StringLiteralToken or StringExpandableToken if the token contains variable references or subexpressions.
+| 15 = @hereStringExpandable // A double quoted here string literal. Tokens with this kind are always instances of StringExpandableToken. even if there are no nested tokens to expand.
+| 14 = @hereStringLiteral // A single quoted here string literal. Tokens with this kind are always instances of StringLiteralToken.
+| 167 = @hidden // The 'hidden' keyword
+| 71 = @icontains // The case insensitive contains operator '-icontains' or '-contains'.
+| 6 = @identifier // A simple identifier, always begins with a letter or '', and is followed by letters, numbers, or ''.
+| 60 = @ieq // The case insensitive equal operator '-ieq' or '-eq'.
+| 138 = @if // The 'if' keyword.
+| 62 = @ige // The case insensitive greater than or equal operator '-ige' or '-ge'.
+| 63 = @igt // The case insensitive greater than operator '-igt' or '-gt'.
+| 73 = @iin // The case insensitive in operator '-iin' or '-in'.
+| 65 = @ile // The case insensitive less than or equal operator '-ile' or '-le'.
+| 66 = @ilike // The case insensitive like operator '-ilike' or '-like'.
+| 64 = @ilt // The case insensitive less than operator '-ilt' or '-lt'.
+| 68 = @imatch // The case insensitive match operator '-imatch' or '-match'.
+| 139 = @in // The 'in' keyword.
+| 61 = @ine // The case insensitive not equal operator '-ine' or '-ne'.
+| 154 = @inlineScript // The 'InlineScript' keyword
+| 72 = @inotcontains // The case insensitive notcontains operator '-inotcontains' or '-notcontains'.
+| 74 = @inotin // The case insensitive notin operator '-inotin' or '-notin'
+| 67 = @inotlike // The case insensitive not like operator '-inotlike' or '-notlike'.
+| 69 = @inotmatch // The case insensitive not match operator '-inotmatch' or '-notmatch'.
+| 160 = @interface // The 'interface' keyword
+| 70 = @ireplace // The case insensitive replace operator '-ireplace' or '-replace'.
+| 92 = @is // The type test operator '-is'.
+| 93 = @isNot // The type test operator '-isnot'.
+| 75 = @isplit // The case insensitive split operator '-isplit' or '-split'.
+| 59 = @join // The join operator '-join'.
+| 5 = @label // A label token - always begins with ':', followed by the label name. Tokens with this kind are always instances of LabelToken.
+| 20 = @lBracket // The opening square brace token '['.
+| 18 = @lCurly // The opening curly brace token '{'.
+| 9 = @lineContinuation // A line continuation (backtick followed by newline).
+| 16 = @lParen // The opening parenthesis token '('.
+| 41 = @minus // The substraction operator '-'.
+| 44 = @minusEquals // The subtraction assignment operator '-='.
+| 31 = @minusMinus // The pre-decrement operator '--'.
+| 163 = @module // The 'module' keyword
+| 37 = @multiply // The multiplication operator '*'.
+| 45 = @multiplyEquals // The multiplication assignment operator '*='.
+| 162 = @namespace // The 'namespace' keyword
+| 8 = @newLine // A newline (one of '\n', '\r', or '\r\n').
+| 51 = @not // The logical not operator '-not'.
+| 4 = @number // Any numerical literal token. Tokens with this kind are always instances of NumberToken.
+| 54 = @or // The logical or operator '-or'.
+| 27 = @orOr // The (unimplemented) operator '||'.
+| 152 = @parallel // The 'parallel' keyword.
+| 140 = @param // The 'param' keyword.
+| 3 = @parameter_token // A parameter to a command, always begins with a dash ('-'), followed by the parameter name. Tokens with this kind are always instances of ParameterToken.
+| 29 = @pipe // The pipe operator '|'.
+| 40 = @plus // The addition operator '+'.
+| 43 = @plusEquals // The addition assignment operator '+='.
+| 32 = @plusPlus // The pre-increment operator '++'.
+| 96 = @postfixMinusMinus // The post-decrement operator '--'.
+| 95 = @postfixPlusPlus // The post-increment operator '++'.
+| 158 = @private // The 'private' keyword
+| 141 = @process // The 'process' keyword.
+| 157 = @public // The 'public' keyword
+| 103 = @questionDot // The null conditional member access operator '?.'.
+| 104 = @questionLBracket // The null conditional index access operator '?[]'.
+| 100 = @questionMark // The ternary operator '?'.
+| 102 = @questionQuestion // The null coalesce operator '??'.
+| 101 = @questionQuestionEquals // The null conditional assignment operator '??='.
+| 21 = @rBracket // The closing square brace token ']'.
+| 19 = @rCurly // The closing curly brace token '}'.
+| 49 = @redirectInStd // The (unimplemented) stdin redirection operator '<'.
+| 48 = @redirection_token // A redirection operator such as '2>&1' or '>>'.
+| 39 = @rem // The modulo division (remainder) operator '%'.
+| 47 = @remainderEquals // The modulo division (remainder) assignment operator '%='.
+| 142 = @return // The 'return' keyword.
+| 17 = @rParen // The closing parenthesis token ')'.
+| 25 = @semi // The statement terminator ';'.
+| 153 = @sequence // The 'sequence' keyword.
+| 97 = @shl // The shift left operator.
+| 98 = @shr // The shift right operator.
+| 2 = @splattedVariable // A splatted variable token, always begins with '@' and followed by the variable name. Tokens with this kind are always instances of VariableToken.
+| 159 = @static // The 'static' keyword
+| 13 = @stringExpandable // A double quoted string literal. Tokens with this kind are always instances of StringExpandableToken even if there are no nested tokens to expand.
+| 12 = @stringLiteral_token // A single quoted string literal. Tokens with this kind are always instances of StringLiteralToken.
+| 143 = @switch // The 'switch' keyword.
+| 144 = @throw // The 'throw' keyword.
+| 145 = @trap // The 'trap' keyword.
+| 146 = @try // The 'try' keyword.
+| 164 = @type // The 'type' keyword
+| 0 = @unknown // An unknown token, signifies an error condition.
+| 147 = @until // The 'until' keyword.
+| 148 = @using // The (unimplemented) 'using' keyword.
+| 149 = @var // The (unimplemented) 'var' keyword.
+| 1 = @variable // A variable token, always begins with '$' and followed by the variable name, possibly enclose in curly braces. Tokens with this kind are always instances of VariableToken.
+| 150 = @while // The 'while' keyword.
+| 151 = @workflow // The 'workflow' keyword.
+| 55 = @xor; // The logical exclusive or operator '-xor'.
\ No newline at end of file
diff --git a/powershell/ql/lib/upgrades/802d5b9f407fb0dac894df1c0b4584f2215e1512/semmlecode.powershell.dbscheme b/powershell/ql/lib/upgrades/802d5b9f407fb0dac894df1c0b4584f2215e1512/semmlecode.powershell.dbscheme
new file mode 100644
index 00000000000..c5191f89a6e
--- /dev/null
+++ b/powershell/ql/lib/upgrades/802d5b9f407fb0dac894df1c0b4584f2215e1512/semmlecode.powershell.dbscheme
@@ -0,0 +1,1652 @@
+/* Mandatory */
+sourceLocationPrefix(
+  varchar(900) prefix: string ref
+);
+
+/* Entity Locations */
+@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
+);
+
+/* File Metadata */
+
+numlines(
+  unique int element_id: @file ref,
+  int num_lines: int ref,
+  int num_code: int ref,
+  int num_comment: int ref
+);
+
+files(
+  unique int id: @file,
+  varchar(900) name: string ref
+);
+
+folders(
+  unique int id: @folder,
+  varchar(900) name: string ref
+);
+
+@container = @folder | @file;
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref
+);
+
+is_in_psmodule_path(
+  int file: @file ref
+);
+
+/* Comments */
+comment_entity(
+  unique int id: @comment_entity,
+  int text: @string_literal ref
+);
+
+comment_entity_location(
+  unique int id: @comment_entity ref,
+  int loc: @location ref
+);
+
+/* Messages */
+extractor_messages(
+  unique int id: @extractor_message,
+  int severity: int ref,
+  string origin : string ref,
+  string text : string ref,
+  string entity : string ref,
+  int location: @location_default ref,
+  string stack_trace : string ref
+);
+
+parent(
+  int child: @ast ref,
+  int parent: @ast ref
+);
+
+/* AST Nodes */
+// This is all the kinds of nodes that can inherit from Ast
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.ast?view=powershellsdk-7.3.0
+@ast = @not_implemented | @attribute_base | @catch_clause | @command_element |
+@member | @named_block | @param_block | @parameter | @redirection | @script_block | @statement | @statement_block | @named_attribute_argument;
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.attributebaseast?view=powershellsdk-7.2.0
+@attribute_base = @attribute | @type_constraint;
+
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.memberast?view=powershellsdk-7.3.0
+@member = @function_member | @property_member;
+
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.commandbaseast?view=powershellsdk-7.3.0
+@command_base = @command | @command_expression;
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.chainableast?view=powershellsdk-7.3.0
+@chainable = @command_base | @pipeline | @pipeline_chain;
+//https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.pipelinebaseast?view=powershellsdk-7.3.0
+@pipeline_base = @chainable | @error_statement | @assignment_statement;
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.statementast?view=powershellsdk-7.3.0
+@statement = @block_statement 
+| @break_statement 
+| @command_base
+| @configuration_definition 
+| @continue_statement 
+| @data_statement 
+| @dynamic_keyword_statement 
+| @exit_statement 
+| @function_definition 
+| @if_statement 
+| @labeled_statement 
+| @pipeline_base
+| @return_statement 
+| @throw_statement 
+| @trap_statement 
+| @try_statement 
+| @type_definition
+| @using_statement;
+
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.loopstatementast?view=powershellsdk-7.3.0
+@loop_statement = @do_until_statement | @do_while_statement | @foreach_statement | @for_statement | @while_statement;
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.labeledstatementast?view=powershellsdk-7.3.0
+@labeled_statement = @loop_statement | @switch_statement;
+
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.attributedexpressionast?view=powershellsdk-7.3.0
+@attributed_expression_ast = @attributed_expression | @convert_expression;
+
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.memberexpressionast?view=powershellsdk-7.3.0
+@member_expression_base = @member_expression | @invoke_member_expression; // | @base_ctor_invoke_member_expression
+
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.expressionast?view=powershellsdk-7.3.0
+@expression = @array_expression
+| @array_literal
+| @attributed_expression_ast
+| @binary_expression
+| @error_expression
+| @expandable_string_expression
+| @hash_table
+| @index_expression
+| @member_expression_base
+| @paren_expression
+| @script_block_expression
+| @sub_expression
+| @ternary_expression
+| @type_expression
+| @unary_expression
+| @using_expression
+| @variable_expression
+| @base_constant_expression;
+
+// Constant expression can both be instanced and extended by string constant expression
+@base_constant_expression = @constant_expression | @string_constant_expression;
+
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.commandelementast?view=powershellsdk-7.3.0
+@command_element = @expression | @command_parameter;
+
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.redirectionast?view=powershellsdk-7.3.0
+@redirection = @file_redirection | @merging_redirection;
+
+/** 
+Entries in this table indicate visited C# powershell ast objects which don't have parsing implemented yet.  
+
+You can obtain the Type of the C# AST objects which don't yet have an associated entity to parse them
+ using this QL query on an extracted db:
+
+from string s
+where not_implemented(_, s)
+select s
+*/
+not_implemented(
+  unique int id: @not_implemented,
+  string name: string ref
+);
+
+not_implemented_location(
+  int id: @not_implemented ref,
+  int loc: @location ref
+);
+
+// ArrayExpressionAst 
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.arrayexpressionast?view=powershellsdk-7.3.0
+array_expression(
+  unique int id: @array_expression,
+  int subExpression: @statement_block ref
+)
+
+array_expression_location(
+  int id: @array_expression ref,
+  int loc: @location ref
+)
+
+// ArrayLiteralAst 
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.arrayliteralast?view=powershellsdk-7.3.0
+array_literal(
+  unique int id: @array_literal
+)
+
+array_literal_location(
+  int id: @array_literal ref,
+  int loc: @location ref
+)
+
+array_literal_element(
+  int id: @array_literal ref,
+  int index: int ref,
+  int component: @expression ref
+)
+
+// AssignmentStatementAst 
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.assignmentstatementast?view=powershellsdk-7.3.0
+// https://github.com/PowerShell/PowerShell/blob/48c9d683565ed9402430a27e09410d56d52d4bfd/src/System.Management.Automation/engine/parser/Compiler.cs#L983-L989
+assignment_statement(
+  unique int id: @assignment_statement,
+  int kind: int ref, // @token_kind ref
+  int left: @expression ref,
+  int right: @statement ref
+)
+
+assignment_statement_location(
+  int id: @assignment_statement ref,
+  int loc: @location ref
+)
+
+// NamedBlockAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.namedblockast?view=powershellsdk-7.3.0
+named_block(
+  unique int id: @named_block,
+  int numStatements: int ref,
+  int numTraps: int ref
+)
+
+named_block_statement(
+  int id: @named_block ref,
+  int index: int ref,
+  int statement: @statement ref
+)
+
+named_block_trap(
+  int id: @named_block ref,
+  int index: int ref,
+  int trap: @trap_statement ref
+)
+
+named_block_location(
+  int id: @named_block ref,
+  int loc: @location ref
+)
+
+// ScriptBlockAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.scriptblockast?view=powershellsdk-7.3.0
+script_block(
+  unique int id: @script_block,
+  int numUsings: int ref,
+  int numRequiredModules: int ref,
+  int numRequiredAssemblies: int ref,
+  int numRequiredPsEditions: int ref,
+  int numRequiredPsSnapins: int ref
+)
+
+script_block_param_block(
+  int id: @script_block ref,
+  int the_param_block: @param_block ref
+)
+
+script_block_begin_block(
+  int id: @script_block ref,
+  int begin_block: @named_block ref
+)
+
+script_block_clean_block(
+  int id: @script_block ref,
+  int clean_block: @named_block ref
+)
+
+script_block_dynamic_param_block(
+  int id: @script_block ref,
+  int dynamic_param_block: @named_block ref
+)
+
+script_block_end_block(
+  int id: @script_block ref,
+  int end_block: @named_block ref
+)
+
+script_block_process_block(
+  int id: @script_block ref,
+  int process_block: @named_block ref
+)
+
+script_block_using(
+  int id: @script_block ref,
+  int index: int ref,
+  int using: @ast ref
+)
+
+script_block_required_application_id(
+  int id: @script_block ref,
+  string application_id: string ref
+)
+
+script_block_requires_elevation(
+  int id: @script_block ref,
+  boolean requires_elevation: boolean ref
+)
+
+script_block_required_ps_version(
+  int id: @script_block ref,
+  string required_ps_version: string ref
+)
+
+script_block_required_module(
+  int id: @script_block ref,
+  int index: int ref,
+  int required_module: @module_specification ref
+)
+
+script_block_required_assembly(
+  int id: @script_block ref,
+  int index: int ref,
+  string required_assembly: string ref
+)
+
+script_block_required_ps_edition(
+  int id: @script_block ref,
+  int index: int ref,
+  string required_ps_edition: string ref
+)
+
+script_block_requires_ps_snapin(
+  int id: @script_block ref,
+  int index: int ref,
+  string name: string ref,
+  string version: string ref
+)
+
+script_block_location(
+  int id: @script_block ref,
+  int loc: @location ref
+)
+
+// ModuleSpecification
+// https://learn.microsoft.com/en-us/dotnet/api/microsoft.powershell.commands.modulespecification?view=powershellsdk-7.3.0
+module_specification(
+  unique int id: @module_specification,
+  string name: string ref,
+  string guid: string ref,
+  string maxVersion: string ref,
+  string requiredVersion: string ref,
+  string version: string ref
+)
+
+// BinaryExpressionAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.binaryexpressionast?view=powershellsdk-7.3.0
+// https://github.com/PowerShell/PowerShell/blob/48c9d683565ed9402430a27e09410d56d52d4bfd/src/System.Management.Automation/engine/parser/Compiler.cs#L5675-L5947
+binary_expression(
+  unique int id: @binary_expression,
+  int kind: int ref, // @token_kind ref
+  int left: @expression ref,
+  int right: @expression ref
+)
+
+// @binary_expression_kind = @And | @Is | @IsNot | @As | @DotDot | @Multiply | @Divide | @Rem | @Plus | @Minus | @Format | @Xor | @Shl | @Shr | @Band | @Bor | @Bxor | @Join | @Ieq | @Ine | @Ige | @Igt | @Ilt | @Ile | @Ilike | @Inotlike | @Inotmatch | @Imatch | @Ireplace | @Inotcontains | @Icontains | @Iin | @Inotin | @Isplit | @Ceq | @Cge | @Cgt | @Clt | @Cle | @Clike | @Cnotlike | @Cnotmatch | @Cmatch | @Ccontains | @Creplace | @Cin | @Cnotin | @Csplit | @QuestionQuestion;
+
+binary_expression_location(
+  int id: @binary_expression ref,
+  int loc: @location ref
+)
+
+// ConstantExpressionAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.constantexpressionast?view=powershellsdk-7.3.0
+constant_expression(
+  unique int id: @constant_expression,
+  string staticType: string ref
+)
+
+constant_expression_value(
+  int id: @constant_expression ref,
+  int value: @string_literal ref
+)
+
+constant_expression_location(
+  int id: @constant_expression ref,
+  int loc: @location ref
+)
+
+// ConvertExpressionAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.convertexpressionast?view=powershellsdk-7.3.0
+convert_expression(
+  unique int id: @convert_expression,
+  int the_attribute: @ast ref,
+  int child: @ast ref,
+  int object_type: @ast ref,
+  string staticType: string ref
+)
+
+convert_expression_location(
+  int id: @convert_expression ref,
+  int loc: @location ref
+)
+
+// IndexExpressionAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.indexexpressionast?view=powershellsdk-7.3.0
+index_expression(
+  unique int id: @index_expression,
+  int index: @ast ref,
+  int target: @ast ref,
+  boolean nullConditional: boolean ref
+)
+
+index_expression_location(
+  int id: @index_expression ref,
+  int loc: @location ref
+)
+
+// IfStatementAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.ifstatementast?view=powershellsdk-7.3.0
+if_statement(
+  unique int id: @if_statement
+)
+
+if_statement_clause(
+  int id: @if_statement ref,
+  int index: int ref,
+  int item1: @pipeline_base ref,
+  int item2: @statement_block ref
+)
+
+if_statement_else(
+  int id: @if_statement ref,
+  int elseItem: @statement_block ref 
+)
+
+if_statement_location(
+  int id: @if_statement ref,
+  int loc: @location ref
+)
+
+// MemberExpressionAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.memberexpressionast?view=powershellsdk-7.3.0
+member_expression(
+  unique int id: @member_expression,
+  int expression: @ast ref,
+  int member: @ast ref,
+  boolean nullConditional: boolean ref,
+  boolean isStatic: boolean ref
+)
+
+member_expression_location(
+  int id: @member_expression ref,
+  int loc: @location ref
+)
+
+// StatementBlockAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.statementblockast?view=powershellsdk-7.3.0
+statement_block(
+  unique int id: @statement_block,
+  int numStatements: int ref,
+  int numTraps : int ref
+)
+
+statement_block_location(
+  int id: @statement_block ref,
+  int loc: @location ref
+)
+
+statement_block_statement(
+  int id: @statement_block ref,
+  int index: int ref,
+  int statement: @statement ref
+)
+
+statement_block_trap(
+  int id: @statement_block ref,
+  int index: int ref,
+  int trap: @trap_statement ref
+)
+
+// SubExpressionAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.subexpressionast?view=powershellsdk-7.3.0
+sub_expression(
+  unique int id: @sub_expression,
+  int subExpression: @statement_block ref
+)
+
+sub_expression_location(
+  int id: @sub_expression ref,
+  int loc: @location ref
+)
+
+// VariableExpressionAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.variableexpressionast?view=powershellsdk-7.3.0
+variable_expression(
+  unique int id: @variable_expression,
+  string userPath: string ref,
+  string driveName: string ref,
+  boolean isConstant: boolean ref,
+  boolean isGlobal: boolean ref,
+  boolean isLocal: boolean ref,
+  boolean isPrivate: boolean ref,
+  boolean isScript: boolean ref,
+  boolean isUnqualified: boolean ref,
+  boolean isUnscoped: boolean ref,
+  boolean isVariable: boolean ref,
+  boolean isDriveQualified: boolean ref
+)
+
+variable_expression_location(
+  int id: @variable_expression ref,
+  int loc: @location ref
+)
+
+// CommandExpressionAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.commandexpressionast?view=powershellsdk-7.3.0
+command_expression(
+  unique int id: @command_expression,
+  int wrapped: @expression ref,
+  int numRedirections: int ref
+)
+
+command_expression_location(
+  int id: @command_expression ref,
+  int loc: @location ref
+)
+
+command_expression_redirection(
+  int id: @command_expression ref,
+  int index: int ref,
+  int redirection: @redirection ref
+)
+
+// StringConstantExpressionAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.stringconstantexpressionast?view=powershellsdk-7.3.0
+string_constant_expression(
+  unique int id: @string_constant_expression,
+  int value: @string_literal ref
+)
+
+string_constant_expression_location(
+  int id: @string_constant_expression ref,
+  int loc: @location ref
+)
+
+// PipelineAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.pipelineast?view=powershellsdk-7.3.0
+pipeline(
+  unique int id: @pipeline,
+  int numComponents: int ref
+)
+
+pipeline_location(
+  int id: @pipeline ref,
+  int loc: @location ref
+)
+
+pipeline_component(
+  int id: @pipeline ref,
+  int index: int ref,
+  int component: @command_base ref
+)
+
+// CommandAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.commandast?view=powershellsdk-7.3.0
+command(
+  unique int id: @command,
+  string name: string ref,
+  int kind: int ref, // @token_kind ref
+  int numElements: int ref,
+  int numRedirections: int ref
+)
+
+command_location(
+  int id: @command ref,
+  int loc: @location ref
+)
+
+command_command_element(
+  int id: @command ref,
+  int index: int ref,
+  int component: @command_element ref
+)
+
+command_redirection(
+  int id: @command ref,
+  int index: int ref,
+  int redirection: @redirection ref
+)
+
+// InvokeMemberExpressionAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.invokememberexpressionast?view=powershellsdk-7.3.0
+invoke_member_expression(
+  unique int id: @invoke_member_expression,
+  int expression: @expression ref,
+  int member: @command_element ref
+)
+
+invoke_member_expression_location(
+  int id: @invoke_member_expression ref,
+  int loc: @location ref
+)
+
+invoke_member_expression_argument(
+  int id: @invoke_member_expression ref,
+  int index: int ref,
+  int argument: @expression ref
+)
+
+// ParenExpressionAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.parenexpressionast?view=powershellsdk-7.3.0
+paren_expression(
+  unique int id: @paren_expression,
+  int expression: @pipeline_base ref
+)
+
+paren_expression_location(
+  int id: @paren_expression ref,
+  int loc: @location ref
+)
+
+
+// TernaryStatementAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.ternaryexpressionast?view=powershellsdk-7.3.0
+ternary_expression(
+  unique int id: @ternary_expression, 
+  int condition: @expression ref,
+  int ifFalse: @expression ref,
+  int iftrue: @expression ref
+)
+
+ternary_expression_location(
+  int id: @ternary_expression ref,
+  int loc: @location ref
+)
+
+// ExitStatementAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.exitstatementast?view=powershellsdk-7.3.0
+exit_statement(
+  unique int id: @exit_statement
+)
+
+exit_statement_pipeline(
+  int id: @exit_statement ref,
+  int expression: @pipeline_base ref
+)
+
+exit_statement_location(
+  int id: @exit_statement ref,
+  int loc: @location ref
+)
+
+
+// TypeExpressionAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.typeexpressionast?view=powershellsdk-7.3.0
+type_expression(
+  unique int id: @type_expression,
+  string name: string ref,
+  string fullName: string ref
+)
+
+type_expression_location(
+  int id: @type_expression ref,
+  int loc: @location ref
+)
+
+// CommandParameterAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.commandparameterast?view=powershellsdk-7.3.0
+command_parameter(
+  unique int id: @command_parameter,
+  string name: string ref
+)
+
+command_parameter_location(
+  int id: @command_parameter ref,
+  int loc: @location ref
+)
+
+command_parameter_argument(
+  int id: @command_parameter ref,
+  int argument: @ast ref
+)
+
+// NamedAttributeArgumentAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.namedattributeargumentast?view=powershellsdk-7.3.0
+named_attribute_argument(
+  unique int id: @named_attribute_argument,
+  string name: string ref,
+  int argument: @expression ref
+)
+
+named_attribute_argument_location(
+  int id: @named_attribute_argument ref,
+  int loc: @location ref
+)
+
+// AttributeAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.attributeast?view=powershellsdk-7.3.0
+attribute(
+  unique int id: @attribute,
+  string name: string ref,
+  int numNamedArguments: int ref,
+  int numPositionalArguments: int ref
+)
+
+attribute_named_argument(
+  int id: @attribute ref,
+  int index: int ref,
+  int argument: @named_attribute_argument ref
+)
+
+attribute_positional_argument(
+  int id: @attribute ref,
+  int index: int ref,
+  int argument: @expression ref
+)
+
+attribute_location(
+  int id: @attribute ref,
+  int id: @location ref
+)
+
+// ParamBlockAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.paramblockast?view=powershellsdk-7.3.0
+param_block(
+  unique int id: @param_block,
+  int numAttributes: int ref,
+  int numParameters: int ref
+)
+
+param_block_attribute(
+  int id: @param_block ref,
+  int index: int ref,
+  int the_attribute: @attribute ref
+)
+
+param_block_parameter(
+  int id: @param_block ref,
+  int index: int ref,
+  int the_parameter: @parameter ref
+)
+
+param_block_location(
+  int id: @param_block ref,
+  int id: @location ref
+)
+
+// ParameterAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.parameterast?view=powershellsdk-7.3.0
+parameter(
+  unique int id: @parameter,
+  int name: @variable_expression ref,
+  string staticType: string ref,
+  int numAttributes: int ref
+)
+
+parameter_attribute(
+  int id: @parameter ref,
+  int index: int ref,
+  int the_attribute: @attribute_base ref
+)
+
+parameter_location(
+  int id: @parameter ref,
+  int loc: @location ref
+)
+
+parameter_default_value(
+  int id: @parameter ref,
+  int default_value: @expression ref
+)
+
+// TypeConstraintAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.typeconstraintast?view=powershellsdk-7.3.0
+type_constraint(
+  unique int id: @type_constraint,
+  string name: string ref,
+  string fullName: string ref
+)
+
+type_constraint_location(
+  int id: @type_constraint ref,
+  int loc: @location ref
+)
+
+// FunctionDefinitionAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.functiondefinitionast?view=powershellsdk-7.3.0
+function_definition(
+  unique int id: @function_definition,
+  int body: @script_block ref,
+  string name: string ref,
+  boolean isFilter: boolean ref,
+  boolean isWorkflow: boolean ref
+)
+
+function_definition_parameter(
+  int id: @function_definition ref,
+  int index: int ref,
+  int parameter: @parameter ref
+)
+
+function_definition_location(
+  int id: @function_definition ref,
+  int loc: @location ref
+)
+
+// BreakStatementAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.breakstatementast?view=powershellsdk-7.3.0
+break_statement(
+  unique int id: @break_statement
+)
+
+break_statement_location(
+  int id: @break_statement ref,
+  int loc: @location ref
+)
+
+// ContinueStatementAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.continuestatementast?view=powershellsdk-7.3.0
+continue_statement(
+  unique int id: @continue_statement
+)
+
+continue_statement_location(
+  int id: @continue_statement ref,
+  int loc: @location ref
+)
+@labelled_statement = @continue_statement | @break_statement;
+
+statement_label(
+  int id: @labelled_statement ref,
+  int label: @expression ref
+)
+
+// ReturnStatementAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.returnstatementast?view=powershellsdk-7.3.0
+return_statement(
+  unique int id: @return_statement
+)
+
+return_statement_pipeline(
+  int id: @return_statement ref,
+  int pipeline: @pipeline_base ref
+)
+
+return_statement_location(
+  int id: @return_statement ref,
+  int loc: @location ref
+)
+
+// DoWhileStatementAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.dowhilestatementast?view=powershellsdk-7.3.0
+do_while_statement(
+  unique int id: @do_while_statement,
+  int body: @statement_block ref
+)
+
+do_while_statement_condition(
+  int id: @do_while_statement ref,
+  int condition: @pipeline_base ref
+)
+
+do_while_statement_location(
+  int id: @do_while_statement ref,
+  int loc: @location ref
+)
+
+// DoUntilStatementAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.dountilstatementast?view=powershellsdk-7.3.0
+do_until_statement(
+  unique int id: @do_until_statement,
+  int body: @statement_block ref
+)
+
+do_until_statement_condition(
+  int id: @do_until_statement ref,
+  int condition: @pipeline_base ref
+)
+
+do_until_statement_location(
+  int id: @do_until_statement ref,
+  int loc: @location ref
+)
+
+// WhileStatementAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.whilestatementast?view=powershellsdk-7.3.0
+while_statement(
+  unique int id: @while_statement,
+  int body: @statement_block ref
+)
+
+while_statement_condition(
+  int id: @while_statement ref,
+  int condition: @pipeline_base ref
+)
+
+while_statement_location(
+  int id: @while_statement ref,
+  int loc: @location ref
+)
+
+// ForEachStatementAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.foreachstatementast?view=powershellsdk-7.3.0
+foreach_statement(
+  unique int id: @foreach_statement,
+  int variable: @variable_expression ref,
+  int condition: @pipeline_base ref,
+  int body: @statement_block ref,
+  int flags: int ref
+)
+
+foreach_statement_location(
+  int id: @foreach_statement ref,
+  int loc: @location ref
+)
+
+// ForStatementAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.forstatementast?view=powershellsdk-7.3.0
+for_statement(
+  unique int id: @for_statement,
+  int body: @statement_block ref
+)
+
+for_statement_location(
+  int id: @for_statement ref,
+  int loc: @location ref
+)
+
+for_statement_condition(
+  int id: @for_statement ref,
+  int condition: @pipeline_base ref
+)
+
+for_statement_initializer(
+  int id: @for_statement ref,
+  int initializer: @pipeline_base ref
+)
+
+for_statement_iterator(
+  int id: @for_statement ref,
+  int iterator: @pipeline_base ref
+)
+
+// ExpandableStringExpressionAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.expandablestringexpressionast?view=powershellsdk-7.3.0
+expandable_string_expression(
+  unique int id: @expandable_string_expression,
+  int value: @string_literal ref,
+  int kind: int ref,
+  int numExpression: int ref
+)
+
+case @expandable_string_expression.kind of
+ 4 = @BareWord
+| 2 = @DoubleQuoted
+| 3 = @DoubleQuotedHereString
+| 0 = @SingleQuoted
+| 1 = @SingleQuotedHereString;
+
+expandable_string_expression_location(
+  int id: @expandable_string_expression ref,
+  int loc: @location ref
+)
+
+expandable_string_expression_nested_expression(
+  int id: @expandable_string_expression ref,
+  int index: int ref,
+  int nestedExression: @expression ref
+)
+
+// StringLiterals
+// Contains string literals broken into lines to prevent breaks in the trap from multiline strings
+string_literal(
+  unique int id: @string_literal
+)
+
+string_literal_location(
+  int id: @string_literal ref,
+  int loc: @location ref
+)
+
+string_literal_line(
+  int id: @string_literal ref,
+  int lineNum: int ref,
+  string line: string ref
+)
+
+// UnaryExpressionAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.unaryexpressionast?view=powershellsdk-7.3.0
+unary_expression(
+  unique int id: @unary_expression,
+  int child: @ast ref,
+  int kind: int ref,
+  string staticType: string ref
+)
+
+unary_expression_location(
+  int id: @unary_expression ref,
+  int loc: @location ref
+)
+
+// CatchClauseAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.catchclauseast?view=powershellsdk-7.3.0
+catch_clause(
+  unique int id: @catch_clause,
+  int body: @statement_block ref,
+  boolean isCatchAll: boolean ref
+)
+
+catch_clause_catch_type(
+  int id: @catch_clause ref,
+  int index: int ref,
+  int catch_type: @type_constraint ref
+)
+
+catch_clause_location(
+  int id: @catch_clause ref,
+  int loc: @location ref
+)
+
+// ThrowStatementAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.throwstatementast?view=powershellsdk-7.3.0
+throw_statement(
+  unique int id: @throw_statement,
+  boolean isRethrow: boolean ref
+)
+
+throw_statement_location(
+  int id: @throw_statement ref,
+  int loc: @location ref
+)
+
+throw_statement_pipeline(
+  int id: @throw_statement ref,
+  int pipeline: @ast ref
+)
+
+// TryStatementAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.trystatementast?view=powershellsdk-7.3.0
+try_statement(
+  unique int id: @try_statement,
+  int body: @statement_block ref
+)
+
+try_statement_catch_clause(
+  int id: @try_statement ref,
+  int index: int ref,
+  int catch_clause: @catch_clause ref
+)
+
+
+try_statement_finally(
+  int id: @try_statement ref,
+  int finally: @ast ref
+)
+
+try_statement_location(
+  int id: @try_statement ref,
+  int loc: @location ref
+)
+
+// FileRedirectionAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.fileredirectionast?view=powershellsdk-7.3.0
+file_redirection(
+  unique int id: @file_redirection,
+  int location: @ast ref,
+  boolean isAppend: boolean ref,
+  int redirectionType: int ref
+)
+
+case @file_redirection.redirectionType of
+ 0 = @All
+| 1 = @Output
+| 2 = @Error
+| 3 = @Warning
+| 4 = @Verbose
+| 5 = @Debug
+| 6 = @Information;
+
+file_redirection_location(
+  int id: @file_redirection ref,
+  int loc: @location ref
+)
+
+// BlockStatementAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.blockstatementast?view=powershellsdk-7.3.0
+block_statement(
+  unique int id: @block_statement,
+  int body: @ast ref,
+  int token: @token ref
+)
+
+block_statement_location(
+  int id: @block_statement ref,
+  int loc: @location ref
+)
+
+// Token
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.token?view=powershellsdk-7.3.0
+token(
+  unique int id: @token,
+  boolean hasError: boolean ref,
+  int kind: int ref,
+  string text: string ref,
+  int tokenFlags: int ref
+)
+
+token_location(
+  int id: @token ref,
+  int loc: @location ref
+)
+
+// ConfigurationDefinitionAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.configurationdefinitionast?view=powershellsdk-7.3.0
+configuration_definition(
+  unique int id: @configuration_definition,
+  int body: @script_block_expression ref,
+  int configurationType: int ref,
+  int name: @expression ref
+)
+
+configuration_definition_location(
+  int id: @configuration_definition ref,
+  int loc: @location ref
+)
+
+// DataStatementAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.datastatementast?view=powershellsdk-7.3.0
+data_statement(
+  unique int id: @data_statement,
+  int body: @statement_block ref
+)
+
+data_statement_variable(
+  int id: @data_statement ref,
+  string variable: string ref
+)
+
+data_statement_commands_allowed(
+  int id: @data_statement ref,
+  int index: int ref,
+  int command_allowed: @ast ref
+)
+
+data_statement_location(
+  int id: @data_statement ref,
+  int loc: @location ref
+)
+
+// DynamicKeywordStatementAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.dynamickeywordstatementast?view=powershellsdk-7.3.0
+dynamic_keyword_statement(
+  unique int id: @dynamic_keyword_statement
+)
+
+dynamic_keyword_statement_command_elements(
+  int id: @dynamic_keyword_statement ref,
+  int index: int ref,
+  int element: @command_element ref
+)
+
+dynamic_keyword_statement_location(
+  int id: @dynamic_keyword_statement ref,
+  int loc: @location ref
+)
+
+// ErrorExpressionAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.errorexpressionast?view=powershellsdk-7.3.0
+error_expression(
+  unique int id: @error_expression
+)
+
+error_expression_nested_ast(
+  int id: @error_expression ref,
+  int index: int ref,
+  int nested_ast: @ast ref
+)
+
+error_expression_location(
+  int id: @error_expression ref,
+  int loc: @location ref
+)
+
+// ErrorStatementAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.errorstatementast?view=powershellsdk-7.3.0
+error_statement(
+  unique int id: @error_statement,
+  int token: @token ref
+)
+
+error_statement_location(
+  int id: @error_statement ref,
+  int loc: @location ref
+)
+
+error_statement_nested_ast(
+  int id: @error_statement ref,
+  int index: int ref,
+  int nested_ast: @ast ref
+)
+
+error_statement_conditions(
+  int id: @error_statement ref,
+  int index: int ref,
+  int condition: @ast ref
+)
+
+error_statement_bodies(
+  int id: @error_statement ref,
+  int index: int ref,
+  int body: @ast ref
+)
+
+error_statement_flag(
+  int id: @error_statement ref,
+  int index: int ref,
+  int k: string ref, // The key
+  int token: @token ref, // These two form a tuple of the value
+  int ast: @ast ref
+)
+
+// FunctionMemberAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.functionmemberast?view=powershellsdk-7.3.0
+function_member(
+  unique int id: @function_member,
+  int body: @ast ref,
+  boolean isConstructor: boolean ref,
+  boolean isHidden: boolean ref,
+  boolean isPrivate: boolean ref,
+  boolean isPublic: boolean ref,
+  boolean isStatic: boolean ref,
+  string name: string ref,
+  int methodAttributes: int ref
+)
+
+function_member_location(
+  int id: @function_member ref,
+  int loc: @location ref
+)
+
+function_member_parameter(
+  int id: @function_member ref,
+  int index: int ref,
+  int parameter: @ast ref
+)
+
+function_member_attribute(
+  int id: @function_member ref,
+  int index: int ref,
+  int attribute: @ast ref
+)
+
+function_member_return_type(
+  int id: @function_member ref,
+  int return_type: @type_constraint ref
+)
+
+// MergingRedirectionAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.mergingredirectionast?view=powershellsdk-7.3.0
+merging_redirection(
+  unique int id: @merging_redirection,
+  int from: int ref,
+  int to: int ref
+)
+
+merging_redirection_location(
+  int id: @merging_redirection ref,
+  int loc: @location ref
+)
+
+
+label(
+  int id: @labeled_statement ref,
+  string label: string ref
+)
+
+// TrapStatementAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.trapstatementast?view=powershellsdk-7.3.0
+trap_statement(
+  unique int id: @trap_statement,
+  int body: @ast ref
+)
+
+trap_statement_type(
+  int id: @trap_statement ref,
+  int trap_type: @type_constraint ref
+)
+
+trap_statement_location(
+  int id: @trap_statement ref,
+  int loc: @location ref
+)
+
+// PipelineChainAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.pipelinechainast?view=powershellsdk-7.3.0
+pipeline_chain(
+  unique int id: @pipeline_chain,
+  boolean isBackground: boolean ref,
+  int kind: int ref,
+  int left: @ast ref,
+  int right: @ast ref
+)
+
+pipeline_chain_location(
+  int id: @pipeline_chain ref,
+  int loc: @location ref
+)
+
+// PropertyMemberAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.propertymemberast?view=powershellsdk-7.3.0
+property_member(
+  unique int id: @property_member,
+  boolean isHidden: boolean ref,
+  boolean isPrivate: boolean ref,
+  boolean isPublic: boolean ref,
+  boolean isStatic: boolean ref,
+  string name: string ref,
+  int methodAttributes: int ref
+)
+
+property_member_attribute(
+  int id: @property_member ref,
+  int index: int ref,
+  int attribute: @ast ref
+)
+
+property_member_property_type(
+  int id: @property_member ref,
+  int property_type: @type_constraint ref
+)
+
+property_member_initial_value(
+  int id: @property_member ref,
+  int initial_value: @ast ref
+)
+
+property_member_location(
+  int id: @property_member ref,
+  int loc: @location ref
+)
+
+// ScriptBlockExpressionAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.scriptblockexpressionast?view=powershellsdk-7.3.0
+script_block_expression(
+  unique int id: @script_block_expression,
+  int body: @script_block ref
+)
+
+script_block_expression_location(
+  int id: @script_block_expression ref,
+  int loc: @location ref
+)
+
+// SwitchStatementAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.switchstatementast?view=powershellsdk-7.3.0
+switch_statement(
+  unique int id: @switch_statement,
+  int condition: @ast ref,
+  int flags: int ref
+)
+
+switch_statement_clauses(
+  int id: @switch_statement ref,
+  int index: int ref,
+  int expression: @ast ref,
+  int statementBlock: @ast ref
+)
+
+switch_statement_location(
+  int id: @switch_statement ref,
+  int loc: @location ref
+)
+
+switch_statement_default(
+  int id: @switch_statement ref,
+  int default: @ast ref
+)
+
+// TypeDefinitionAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.typedefinitionast?view=powershellsdk-7.3.0
+type_definition(
+  unique int id: @type_definition,
+  string name: string ref,
+  int flags: int ref,
+  boolean isClass: boolean ref,
+  boolean isEnum: boolean ref,
+  boolean isInterface: boolean ref
+)
+
+type_definition_attributes(
+  int id: @type_definition ref,
+  int index: int ref,
+  int attribute: @ast ref
+)
+
+type_definition_members(
+  int id: @type_definition ref,
+  int index: int ref,
+  int member: @ast ref
+)
+
+type_definition_location(
+  int id: @type_definition ref,
+  int loc: @location ref
+)
+
+type_definition_base_type(
+  int id: @type_definition ref,
+  int index: int ref,
+  int base_type: @type_constraint ref
+)
+
+// UsingExpressionAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.usingexpressionast?view=powershellsdk-7.3.0
+using_expression(
+  unique int id: @using_expression,
+  int subExpression: @ast ref
+)
+
+using_expression_location(
+  int id: @using_expression ref,
+  int loc: @location ref
+)
+
+// UsingStatementAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.usingstatementast?view=powershellsdk-7.3.0
+using_statement(
+  unique int id: @using_statement,
+  int kind: int ref
+)
+
+using_statement_location(
+  int id: @using_statement ref,
+  int loc: @location ref
+)
+
+using_statement_alias(
+  int id: @using_statement ref,
+  int alias: @ast ref
+)
+
+using_statement_module_specification(
+  int id: @using_statement ref,
+  int module_specification: @ast ref
+)
+
+using_statement_name(
+  int id: @using_statement ref,
+  int name: @ast ref
+)
+
+// HashTableAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.hashtableast?view=powershellsdk-7.3.0
+hash_table(
+  unique int id: @hash_table
+)
+
+hash_table_location(
+  int id: @hash_table ref,
+  int loc: @location ref
+)
+
+hash_table_key_value_pairs(
+  int id: @hash_table ref,
+  int index: int ref,
+  int k: @ast ref,
+  int v: @ast ref
+)
+
+// AttributedExpressionAst
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.attributedexpressionast?view=powershellsdk-7.3.0
+attributed_expression(
+  unique int id: @attributed_expression,
+  int attribute: @ast ref,
+  int expression: @ast ref
+)
+
+attributed_expression_location(
+  int id: @attributed_expression ref,
+  int loc: @location ref
+)
+
+// TokenKind
+// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.tokenkind?view=powershellsdk-7.3.0
+token_kind_reference(
+  unique int id: @token_kind_reference,
+  string name: string ref,
+  int kind: int ref
+)
+
+@token_kind = @ampersand | @and | @andAnd | @as | @assembly | @atCurly | @atParen | @band | @base | @begin | @bnot | @bor | @break 
+| @bxor | @catch | @ccontains | @ceq | @cge | @cgt | @cin | @class | @cle | @clean | @clike | @clt | @cmatch | @cne | @cnotcontains 
+| @cnotin | @cnotlike | @cnotmatch | @colon | @colonColon | @comma | @command_token | @comment | @configuration | @continue | @creplace 
+| @csplit | @data | @default | @define | @divide | @divideEquals | @do | @dollarParen | @dot | @dotDot | @dynamicKeyword | @dynamicparam 
+| @else | @elseIf | @end | @endOfInput | @enum | @equals | @exclaim | @exit | @filter | @finally | @for | @foreach | @format | @from 
+| @function | @generic | @hereStringExpandable | @hereStringLiteral | @hidden | @icontains | @identifier | @ieq | @if | @ige | @igt 
+| @iin | @ile | @ilike | @ilt | @imatch | @in | @ine | @inlineScript | @inotcontains | @inotin | @inotlike | @inotmatch | @interface 
+| @ireplace | @is | @isNot | @isplit | @join | @label | @lBracket | @lCurly | @lineContinuation | @lParen | @minus | @minusEquals 
+| @minusMinus | @module | @multiply | @multiplyEquals | @namespace | @newLine | @not | @number | @or | @orOr | @parallel | @param 
+| @parameter_token | @pipe | @plus | @plusEquals | @plusPlus | @postfixMinusMinus | @postfixPlusPlus | @private | @process | @public 
+| @questionDot | @questionLBracket | @questionMark | @questionQuestion | @questionQuestionEquals | @rBracket | @rCurly | @redirectInStd 
+| @redirection_token | @rem | @remainderEquals | @return | @rParen | @semi | @sequence | @shl | @shr | @splattedVariable | @static 
+| @stringExpandable | @stringLiteral_token | @switch | @throw | @trap | @try | @type | @unknown | @until | @using | @var | @variable 
+| @while | @workflow | @xor;
+
+case @token_kind_reference.kind of
+28 = @ampersand // The invocation operator '&'.
+| 53 = @and // The logical and operator '-and'.
+| 26 = @andAnd // The (unimplemented) operator '&&'.
+| 94 = @as // The type conversion operator '-as'.
+| 165 = @assembly // The 'assembly' keyword
+| 23 = @atCurly // The opening token of a hash expression '@{'.
+| 22 = @atParen // The opening token of an array expression '@('.
+| 56 = @band // The bitwise and operator '-band'.
+| 168 = @base // The 'base' keyword
+| 119 = @begin // The 'begin' keyword.
+| 52 = @bnot // The bitwise not operator '-bnot'.
+| 57 = @bor // The bitwise or operator '-bor'.
+| 120 = @break // The 'break' keyword.
+| 58 = @bxor // The bitwise exclusive or operator '-xor'.
+| 121 = @catch // The 'catch' keyword.
+| 87 = @ccontains // The case sensitive contains operator '-ccontains'.
+| 76 = @ceq // The case sensitive equal operator '-ceq'.
+| 78 = @cge // The case sensitive greater than or equal operator '-cge'.
+| 79 = @cgt // The case sensitive greater than operator '-cgt'.
+| 89 = @cin // The case sensitive in operator '-cin'.
+| 122 = @class // The 'class' keyword.
+| 81 = @cle // The case sensitive less than or equal operator '-cle'.
+| 170 = @clean // The 'clean' keyword.
+| 82 = @clike // The case sensitive like operator '-clike'.
+| 80 = @clt // The case sensitive less than operator '-clt'.
+| 84 = @cmatch // The case sensitive match operator '-cmatch'.
+| 77 = @cne // The case sensitive not equal operator '-cne'.
+| 88 = @cnotcontains // The case sensitive not contains operator '-cnotcontains'.
+| 90 = @cnotin // The case sensitive not in operator '-notin'.
+| 83 = @cnotlike // The case sensitive notlike operator '-cnotlike'.
+| 85 = @cnotmatch // The case sensitive not match operator '-cnotmatch'.
+| 99 = @colon // The PS class base class and implemented interfaces operator ':'. Also used in base class ctor calls.
+| 34 = @colonColon // The static member access operator '::'.
+| 30 = @comma // The unary or binary array operator ','.
+| 166 = @command_token // The 'command' keyword
+| 10 = @comment // A single line comment, or a delimited comment.
+| 155 = @configuration // The "configuration" keyword
+| 123 = @continue // The 'continue' keyword.
+| 86 = @creplace // The case sensitive replace operator '-creplace'.
+| 91 = @csplit // The case sensitive split operator '-csplit'.
+| 124 = @data // The 'data' keyword.
+| 169 = @default // The 'default' keyword
+| 125 = @define // The (unimplemented) 'define' keyword.
+| 38 = @divide // The division operator '/'.
+| 46 = @divideEquals // The division assignment operator '/='.
+| 126 = @do // The 'do' keyword.
+| 24 = @dollarParen // The opening token of a sub-expression '$('.
+| 35 = @dot // The instance member access or dot source invocation operator '.'.
+| 33 = @dotDot // The range operator '..'.
+| 156 = @dynamicKeyword // The token kind for dynamic keywords
+| 127 = @dynamicparam // The 'dynamicparam' keyword.
+| 128 = @else // The 'else' keyword.
+| 129 = @elseIf // The 'elseif' keyword.
+| 130 = @end // The 'end' keyword.
+| 11 = @endOfInput // Marks the end of the input script or file.
+| 161 = @enum // The 'enum' keyword
+| 42 = @equals // The assignment operator '='.
+| 36 = @exclaim // The logical not operator '!'.
+| 131 = @exit // The 'exit' keyword.
+| 132 = @filter // The 'filter' keyword.
+| 133 = @finally // The 'finally' keyword.
+| 134 = @for // The 'for' keyword.
+| 135 = @foreach // The 'foreach' keyword.
+| 50 = @format // The string format operator '-f'.
+| 136 = @from // The (unimplemented) 'from' keyword.
+| 137 = @function // The 'function' keyword.
+| 7 = @generic // A token that is only valid as a command name, command argument, function name, or configuration name. It may contain characters not allowed in identifiers. Tokens with this kind are always instances of StringLiteralToken or StringExpandableToken if the token contains variable references or subexpressions.
+| 15 = @hereStringExpandable // A double quoted here string literal. Tokens with this kind are always instances of StringExpandableToken. even if there are no nested tokens to expand.
+| 14 = @hereStringLiteral // A single quoted here string literal. Tokens with this kind are always instances of StringLiteralToken.
+| 167 = @hidden // The 'hidden' keyword
+| 71 = @icontains // The case insensitive contains operator '-icontains' or '-contains'.
+| 6 = @identifier // A simple identifier, always begins with a letter or '', and is followed by letters, numbers, or ''.
+| 60 = @ieq // The case insensitive equal operator '-ieq' or '-eq'.
+| 138 = @if // The 'if' keyword.
+| 62 = @ige // The case insensitive greater than or equal operator '-ige' or '-ge'.
+| 63 = @igt // The case insensitive greater than operator '-igt' or '-gt'.
+| 73 = @iin // The case insensitive in operator '-iin' or '-in'.
+| 65 = @ile // The case insensitive less than or equal operator '-ile' or '-le'.
+| 66 = @ilike // The case insensitive like operator '-ilike' or '-like'.
+| 64 = @ilt // The case insensitive less than operator '-ilt' or '-lt'.
+| 68 = @imatch // The case insensitive match operator '-imatch' or '-match'.
+| 139 = @in // The 'in' keyword.
+| 61 = @ine // The case insensitive not equal operator '-ine' or '-ne'.
+| 154 = @inlineScript // The 'InlineScript' keyword
+| 72 = @inotcontains // The case insensitive notcontains operator '-inotcontains' or '-notcontains'.
+| 74 = @inotin // The case insensitive notin operator '-inotin' or '-notin'
+| 67 = @inotlike // The case insensitive not like operator '-inotlike' or '-notlike'.
+| 69 = @inotmatch // The case insensitive not match operator '-inotmatch' or '-notmatch'.
+| 160 = @interface // The 'interface' keyword
+| 70 = @ireplace // The case insensitive replace operator '-ireplace' or '-replace'.
+| 92 = @is // The type test operator '-is'.
+| 93 = @isNot // The type test operator '-isnot'.
+| 75 = @isplit // The case insensitive split operator '-isplit' or '-split'.
+| 59 = @join // The join operator '-join'.
+| 5 = @label // A label token - always begins with ':', followed by the label name. Tokens with this kind are always instances of LabelToken.
+| 20 = @lBracket // The opening square brace token '['.
+| 18 = @lCurly // The opening curly brace token '{'.
+| 9 = @lineContinuation // A line continuation (backtick followed by newline).
+| 16 = @lParen // The opening parenthesis token '('.
+| 41 = @minus // The substraction operator '-'.
+| 44 = @minusEquals // The subtraction assignment operator '-='.
+| 31 = @minusMinus // The pre-decrement operator '--'.
+| 163 = @module // The 'module' keyword
+| 37 = @multiply // The multiplication operator '*'.
+| 45 = @multiplyEquals // The multiplication assignment operator '*='.
+| 162 = @namespace // The 'namespace' keyword
+| 8 = @newLine // A newline (one of '\n', '\r', or '\r\n').
+| 51 = @not // The logical not operator '-not'.
+| 4 = @number // Any numerical literal token. Tokens with this kind are always instances of NumberToken.
+| 54 = @or // The logical or operator '-or'.
+| 27 = @orOr // The (unimplemented) operator '||'.
+| 152 = @parallel // The 'parallel' keyword.
+| 140 = @param // The 'param' keyword.
+| 3 = @parameter_token // A parameter to a command, always begins with a dash ('-'), followed by the parameter name. Tokens with this kind are always instances of ParameterToken.
+| 29 = @pipe // The pipe operator '|'.
+| 40 = @plus // The addition operator '+'.
+| 43 = @plusEquals // The addition assignment operator '+='.
+| 32 = @plusPlus // The pre-increment operator '++'.
+| 96 = @postfixMinusMinus // The post-decrement operator '--'.
+| 95 = @postfixPlusPlus // The post-increment operator '++'.
+| 158 = @private // The 'private' keyword
+| 141 = @process // The 'process' keyword.
+| 157 = @public // The 'public' keyword
+| 103 = @questionDot // The null conditional member access operator '?.'.
+| 104 = @questionLBracket // The null conditional index access operator '?[]'.
+| 100 = @questionMark // The ternary operator '?'.
+| 102 = @questionQuestion // The null coalesce operator '??'.
+| 101 = @questionQuestionEquals // The null conditional assignment operator '??='.
+| 21 = @rBracket // The closing square brace token ']'.
+| 19 = @rCurly // The closing curly brace token '}'.
+| 49 = @redirectInStd // The (unimplemented) stdin redirection operator '<'.
+| 48 = @redirection_token // A redirection operator such as '2>&1' or '>>'.
+| 39 = @rem // The modulo division (remainder) operator '%'.
+| 47 = @remainderEquals // The modulo division (remainder) assignment operator '%='.
+| 142 = @return // The 'return' keyword.
+| 17 = @rParen // The closing parenthesis token ')'.
+| 25 = @semi // The statement terminator ';'.
+| 153 = @sequence // The 'sequence' keyword.
+| 97 = @shl // The shift left operator.
+| 98 = @shr // The shift right operator.
+| 2 = @splattedVariable // A splatted variable token, always begins with '@' and followed by the variable name. Tokens with this kind are always instances of VariableToken.
+| 159 = @static // The 'static' keyword
+| 13 = @stringExpandable // A double quoted string literal. Tokens with this kind are always instances of StringExpandableToken even if there are no nested tokens to expand.
+| 12 = @stringLiteral_token // A single quoted string literal. Tokens with this kind are always instances of StringLiteralToken.
+| 143 = @switch // The 'switch' keyword.
+| 144 = @throw // The 'throw' keyword.
+| 145 = @trap // The 'trap' keyword.
+| 146 = @try // The 'try' keyword.
+| 164 = @type // The 'type' keyword
+| 0 = @unknown // An unknown token, signifies an error condition.
+| 147 = @until // The 'until' keyword.
+| 148 = @using // The (unimplemented) 'using' keyword.
+| 149 = @var // The (unimplemented) 'var' keyword.
+| 1 = @variable // A variable token, always begins with '$' and followed by the variable name, possibly enclose in curly braces. Tokens with this kind are always instances of VariableToken.
+| 150 = @while // The 'while' keyword.
+| 151 = @workflow // The 'workflow' keyword.
+| 55 = @xor; // The logical exclusive or operator '-xor'.
\ No newline at end of file
diff --git a/powershell/ql/lib/upgrades/802d5b9f407fb0dac894df1c0b4584f2215e1512/upgrade.properties b/powershell/ql/lib/upgrades/802d5b9f407fb0dac894df1c0b4584f2215e1512/upgrade.properties
new file mode 100644
index 00000000000..042e64009a1
--- /dev/null
+++ b/powershell/ql/lib/upgrades/802d5b9f407fb0dac894df1c0b4584f2215e1512/upgrade.properties
@@ -0,0 +1,2 @@
+description: Add is_in_psmodule_path relation
+compatibility: full
diff --git a/powershell/ql/src/queries/security/cwe-078/CommandInjection.qhelp b/powershell/ql/src/queries/security/cwe-078/CommandInjection.qhelp
new file mode 100644
index 00000000000..b75401a5d70
--- /dev/null
+++ b/powershell/ql/src/queries/security/cwe-078/CommandInjection.qhelp
@@ -0,0 +1,44 @@
+<!DOCTYPE qhelp PUBLIC
+  "-//Semmle//qhelp//EN"
+  "qhelp.dtd">
+<qhelp>
+<overview>
+<p>Code that passes user input directly to
+<code>Invoke-Expression</code>, <code>&</code>, or some other library
+routine that executes a command, allows the user to execute malicious
+code.</p>
+
+</overview>
+<recommendation>
+
+<p>If possible, use hard-coded string literals to specify the command to run
+or library to load. Instead of passing the user input directly to the
+process or library function, examine the user input and then choose
+among hard-coded string literals.</p>
+
+<p>If the applicable libraries or commands cannot be determined at
+compile time, then add code to verify that the user input string is
+safe before using it.</p>
+
+</recommendation>
+<example>
+
+<p>The following example shows code that takes a shell script that can be changed
+maliciously by a user, and passes it straight to <code>Invoke-Expression</code>
+without examining it first.</p>
+
+<sample src="examples/command_injection.ps1" />
+
+</example>
+<references>
+
+<li>
+OWASP:
+<a href="https://www.owasp.org/index.php/Command_Injection">Command Injection</a>.
+</li>
+
+<!--  LocalWords:  CWE untrusted unsanitized Runtime
+ -->
+
+</references>
+</qhelp>
diff --git a/powershell/ql/src/queries/security/cwe-078/CommandInjection.ql b/powershell/ql/src/queries/security/cwe-078/CommandInjection.ql
new file mode 100644
index 00000000000..ca28bea3aa0
--- /dev/null
+++ b/powershell/ql/src/queries/security/cwe-078/CommandInjection.ql
@@ -0,0 +1,25 @@
+/**
+ * @name Uncontrolled command line
+ * @description Using externally controlled strings in a command line may allow a malicious
+ *              user to change the meaning of the command.
+ * @kind path-problem
+ * @problem.severity error
+ * @security-severity 9.8
+ * @precision high
+ * @id powershell/command-injection
+ * @tags correctness
+ *       security
+ *       external/cwe/cwe-078
+ *       external/cwe/cwe-088
+ */
+
+import powershell
+import semmle.code.powershell.security.CommandInjectionQuery
+import CommandInjectionFlow::PathGraph
+
+from CommandInjectionFlow::PathNode source, CommandInjectionFlow::PathNode sink, Source sourceNode
+where
+  CommandInjectionFlow::flowPath(source, sink) and
+  sourceNode = source.getNode()
+select sink.getNode(), source, sink, "This command depends on a $@.", sourceNode,
+  sourceNode.getSourceType()
diff --git a/powershell/ql/src/queries/security/cwe-078/examples/command_injection.ps1 b/powershell/ql/src/queries/security/cwe-078/examples/command_injection.ps1
new file mode 100644
index 00000000000..8874669360e
--- /dev/null
+++ b/powershell/ql/src/queries/security/cwe-078/examples/command_injection.ps1
@@ -0,0 +1,3 @@
+param ($x)
+
+Invoke-Expression -Command "Get-Process -Id $x"
\ No newline at end of file
diff --git a/powershell/ql/test/library-tests/ast/Statements/statements.expected b/powershell/ql/test/library-tests/ast/Statements/statements.expected
index 4741ebf3dba..52cf8de5795 100644
--- a/powershell/ql/test/library-tests/ast/Statements/statements.expected
+++ b/powershell/ql/test/library-tests/ast/Statements/statements.expected
@@ -9,11 +9,11 @@
 | TrapStatement.ps1:1:1:4:2 | TrapTest |
 | TrapStatement.ps1:2:5:2:26 | TrapStatement at: TrapStatement.ps1:2:5:2:26 |
 | TrapStatement.ps1:2:11:2:25 | Error found. |
-| TrapStatement.ps1:3:5:3:19 | nonsenseString |
-| TrapStatement.ps1:6:1:6:9 | TrapTest |
+| TrapStatement.ps1:3:5:3:19 | call to nonsenseString |
+| TrapStatement.ps1:6:1:6:9 | call to TrapTest |
 | Try.ps1:1:1:13:2 | try {...} |
 | Try.ps1:2:4:2:95 | ...=... |
-| Try.ps1:2:17:2:95 | New-Object |
+| Try.ps1:2:17:2:95 | call to New-Object |
 | Try.ps1:2:69:2:94 | ...,... |
 | Try.ps1:3:5:3:21 | throw ... |
 | Try.ps1:3:11:3:21 | Exception |
diff --git a/powershell/ql/test/library-tests/ast/parent.expected b/powershell/ql/test/library-tests/ast/parent.expected
index 13de64d4edc..61bba880ae0 100644
--- a/powershell/ql/test/library-tests/ast/parent.expected
+++ b/powershell/ql/test/library-tests/ast/parent.expected
@@ -24,11 +24,11 @@
 | Arrays/Arrays.ps1:3:14:3:17 | b | Arrays/Arrays.ps1:3:14:3:17 | b |
 | Arrays/Arrays.ps1:5:1:5:8 | array2 | Arrays/Arrays.ps1:5:1:5:37 | ...=... |
 | Arrays/Arrays.ps1:5:1:5:37 | ...=... | Arrays/Arrays.ps1:1:1:15:15 | {...} |
-| Arrays/Arrays.ps1:5:11:5:21 | New-Object | Arrays/Arrays.ps1:5:11:5:37 | New-Object |
-| Arrays/Arrays.ps1:5:11:5:37 | New-Object | Arrays/Arrays.ps1:5:1:5:37 | ...=... |
-| Arrays/Arrays.ps1:5:22:5:33 | object[,] | Arrays/Arrays.ps1:5:11:5:37 | New-Object |
+| Arrays/Arrays.ps1:5:11:5:21 | New-Object | Arrays/Arrays.ps1:5:11:5:37 | call to New-Object |
+| Arrays/Arrays.ps1:5:11:5:37 | call to New-Object | Arrays/Arrays.ps1:5:1:5:37 | ...=... |
+| Arrays/Arrays.ps1:5:22:5:33 | object[,] | Arrays/Arrays.ps1:5:11:5:37 | call to New-Object |
 | Arrays/Arrays.ps1:5:34:5:35 | 2 | Arrays/Arrays.ps1:5:34:5:37 | ...,... |
-| Arrays/Arrays.ps1:5:34:5:37 | ...,... | Arrays/Arrays.ps1:5:11:5:37 | New-Object |
+| Arrays/Arrays.ps1:5:34:5:37 | ...,... | Arrays/Arrays.ps1:5:11:5:37 | call to New-Object |
 | Arrays/Arrays.ps1:5:36:5:37 | 2 | Arrays/Arrays.ps1:5:34:5:37 | ...,... |
 | Arrays/Arrays.ps1:6:1:6:8 | array2 | Arrays/Arrays.ps1:6:1:6:13 | ...[...] |
 | Arrays/Arrays.ps1:6:1:6:13 | ...[...] | Arrays/Arrays.ps1:6:1:6:22 | ...=... |
@@ -98,23 +98,23 @@
 | Dynamic/DynamicExecution.ps1:1:1:5:8 | {...} | Dynamic/DynamicExecution.ps1:1:1:5:8 | DynamicExecution.ps1 |
 | Dynamic/DynamicExecution.ps1:1:8:1:17 | cmd.exe | Dynamic/DynamicExecution.ps1:1:1:1:17 | ...=... |
 | Dynamic/DynamicExecution.ps1:1:8:1:17 | cmd.exe | Dynamic/DynamicExecution.ps1:1:8:1:17 | cmd.exe |
-| Dynamic/DynamicExecution.ps1:2:1:2:18 | Invoke-Expression | Dynamic/DynamicExecution.ps1:2:1:2:23 | Invoke-Expression |
-| Dynamic/DynamicExecution.ps1:2:1:2:23 | Invoke-Expression | Dynamic/DynamicExecution.ps1:1:1:5:8 | {...} |
-| Dynamic/DynamicExecution.ps1:2:19:2:23 | foo | Dynamic/DynamicExecution.ps1:2:1:2:23 | Invoke-Expression |
+| Dynamic/DynamicExecution.ps1:2:1:2:18 | Invoke-Expression | Dynamic/DynamicExecution.ps1:2:1:2:23 | call to Invoke-Expression |
+| Dynamic/DynamicExecution.ps1:2:1:2:23 | call to Invoke-Expression | Dynamic/DynamicExecution.ps1:1:1:5:8 | {...} |
+| Dynamic/DynamicExecution.ps1:2:19:2:23 | foo | Dynamic/DynamicExecution.ps1:2:1:2:23 | call to Invoke-Expression |
 | Dynamic/DynamicExecution.ps1:3:1:3:14 | scriptblock | Dynamic/DynamicExecution.ps1:3:1:3:28 | call to Create |
 | Dynamic/DynamicExecution.ps1:3:1:3:28 | call to Create | Dynamic/DynamicExecution.ps1:1:1:5:8 | {...} |
 | Dynamic/DynamicExecution.ps1:3:1:3:28 | call to Create | Dynamic/DynamicExecution.ps1:3:1:3:28 | call to Create |
 | Dynamic/DynamicExecution.ps1:3:16:3:22 | Create | Dynamic/DynamicExecution.ps1:3:1:3:28 | call to Create |
 | Dynamic/DynamicExecution.ps1:3:23:3:27 | foo | Dynamic/DynamicExecution.ps1:3:1:3:28 | call to Create |
-| Dynamic/DynamicExecution.ps1:4:1:4:32 |  | Dynamic/DynamicExecution.ps1:1:1:5:8 | {...} |
-| Dynamic/DynamicExecution.ps1:4:3:4:32 | (...) | Dynamic/DynamicExecution.ps1:4:1:4:32 |  |
+| Dynamic/DynamicExecution.ps1:4:1:4:32 | call | Dynamic/DynamicExecution.ps1:1:1:5:8 | {...} |
+| Dynamic/DynamicExecution.ps1:4:3:4:32 | (...) | Dynamic/DynamicExecution.ps1:4:1:4:32 | call |
 | Dynamic/DynamicExecution.ps1:4:4:4:17 | scriptblock | Dynamic/DynamicExecution.ps1:4:4:4:31 | call to Create |
 | Dynamic/DynamicExecution.ps1:4:4:4:31 | call to Create | Dynamic/DynamicExecution.ps1:4:3:4:32 | (...) |
 | Dynamic/DynamicExecution.ps1:4:4:4:31 | call to Create | Dynamic/DynamicExecution.ps1:4:4:4:31 | call to Create |
 | Dynamic/DynamicExecution.ps1:4:19:4:25 | Create | Dynamic/DynamicExecution.ps1:4:4:4:31 | call to Create |
 | Dynamic/DynamicExecution.ps1:4:26:4:30 | foo | Dynamic/DynamicExecution.ps1:4:4:4:31 | call to Create |
-| Dynamic/DynamicExecution.ps1:5:1:5:8 |  | Dynamic/DynamicExecution.ps1:1:1:5:8 | {...} |
-| Dynamic/DynamicExecution.ps1:5:2:5:8 | $foo | Dynamic/DynamicExecution.ps1:5:1:5:8 |  |
+| Dynamic/DynamicExecution.ps1:5:1:5:8 | call | Dynamic/DynamicExecution.ps1:1:1:5:8 | {...} |
+| Dynamic/DynamicExecution.ps1:5:2:5:8 | $foo | Dynamic/DynamicExecution.ps1:5:1:5:8 | call |
 | Dynamic/DynamicExecution.ps1:5:3:5:7 | foo | Dynamic/DynamicExecution.ps1:5:2:5:8 | $foo |
 | Dynamic/DynamicExecutionWithFunc.ps1:1:1:11:2 | ExecuteAThing | Dynamic/DynamicExecutionWithFunc.ps1:1:1:11:2 | {...} |
 | Dynamic/DynamicExecutionWithFunc.ps1:1:1:11:2 | {...} | Dynamic/DynamicExecutionWithFunc.ps1:1:1:11:2 | DynamicExecutionWithFunc.ps1 |
@@ -128,27 +128,27 @@
 | Dynamic/DynamicExecutionWithFunc.ps1:5:12:5:34 | ...+... | Dynamic/DynamicExecutionWithFunc.ps1:5:5:5:34 | ...=... |
 | Dynamic/DynamicExecutionWithFunc.ps1:5:12:5:34 | ...+... | Dynamic/DynamicExecutionWithFunc.ps1:5:12:5:34 | ...+... |
 | Dynamic/DynamicExecutionWithFunc.ps1:5:24:5:34 | userInput | Dynamic/DynamicExecutionWithFunc.ps1:5:12:5:34 | ...+... |
-| Dynamic/DynamicExecutionWithFunc.ps1:6:5:6:22 | Invoke-Expression | Dynamic/DynamicExecutionWithFunc.ps1:6:5:6:27 | Invoke-Expression |
-| Dynamic/DynamicExecutionWithFunc.ps1:6:5:6:27 | Invoke-Expression | Dynamic/DynamicExecutionWithFunc.ps1:2:5:10:30 | {...} |
-| Dynamic/DynamicExecutionWithFunc.ps1:6:23:6:27 | foo | Dynamic/DynamicExecutionWithFunc.ps1:6:5:6:27 | Invoke-Expression |
+| Dynamic/DynamicExecutionWithFunc.ps1:6:5:6:22 | Invoke-Expression | Dynamic/DynamicExecutionWithFunc.ps1:6:5:6:27 | call to Invoke-Expression |
+| Dynamic/DynamicExecutionWithFunc.ps1:6:5:6:27 | call to Invoke-Expression | Dynamic/DynamicExecutionWithFunc.ps1:2:5:10:30 | {...} |
+| Dynamic/DynamicExecutionWithFunc.ps1:6:23:6:27 | foo | Dynamic/DynamicExecutionWithFunc.ps1:6:5:6:27 | call to Invoke-Expression |
 | Dynamic/DynamicExecutionWithFunc.ps1:7:5:7:18 | scriptblock | Dynamic/DynamicExecutionWithFunc.ps1:7:5:7:32 | call to Create |
 | Dynamic/DynamicExecutionWithFunc.ps1:7:5:7:32 | call to Create | Dynamic/DynamicExecutionWithFunc.ps1:2:5:10:30 | {...} |
 | Dynamic/DynamicExecutionWithFunc.ps1:7:5:7:32 | call to Create | Dynamic/DynamicExecutionWithFunc.ps1:7:5:7:32 | call to Create |
 | Dynamic/DynamicExecutionWithFunc.ps1:7:20:7:26 | Create | Dynamic/DynamicExecutionWithFunc.ps1:7:5:7:32 | call to Create |
 | Dynamic/DynamicExecutionWithFunc.ps1:7:27:7:31 | foo | Dynamic/DynamicExecutionWithFunc.ps1:7:5:7:32 | call to Create |
-| Dynamic/DynamicExecutionWithFunc.ps1:8:5:8:36 |  | Dynamic/DynamicExecutionWithFunc.ps1:2:5:10:30 | {...} |
-| Dynamic/DynamicExecutionWithFunc.ps1:8:7:8:36 | (...) | Dynamic/DynamicExecutionWithFunc.ps1:8:5:8:36 |  |
+| Dynamic/DynamicExecutionWithFunc.ps1:8:5:8:36 | call | Dynamic/DynamicExecutionWithFunc.ps1:2:5:10:30 | {...} |
+| Dynamic/DynamicExecutionWithFunc.ps1:8:7:8:36 | (...) | Dynamic/DynamicExecutionWithFunc.ps1:8:5:8:36 | call |
 | Dynamic/DynamicExecutionWithFunc.ps1:8:8:8:21 | scriptblock | Dynamic/DynamicExecutionWithFunc.ps1:8:8:8:35 | call to Create |
 | Dynamic/DynamicExecutionWithFunc.ps1:8:8:8:35 | call to Create | Dynamic/DynamicExecutionWithFunc.ps1:8:7:8:36 | (...) |
 | Dynamic/DynamicExecutionWithFunc.ps1:8:8:8:35 | call to Create | Dynamic/DynamicExecutionWithFunc.ps1:8:8:8:35 | call to Create |
 | Dynamic/DynamicExecutionWithFunc.ps1:8:23:8:29 | Create | Dynamic/DynamicExecutionWithFunc.ps1:8:8:8:35 | call to Create |
 | Dynamic/DynamicExecutionWithFunc.ps1:8:30:8:34 | foo | Dynamic/DynamicExecutionWithFunc.ps1:8:8:8:35 | call to Create |
-| Dynamic/DynamicExecutionWithFunc.ps1:9:5:9:12 |  | Dynamic/DynamicExecutionWithFunc.ps1:2:5:10:30 | {...} |
-| Dynamic/DynamicExecutionWithFunc.ps1:9:6:9:12 | $foo | Dynamic/DynamicExecutionWithFunc.ps1:9:5:9:12 |  |
+| Dynamic/DynamicExecutionWithFunc.ps1:9:5:9:12 | call | Dynamic/DynamicExecutionWithFunc.ps1:2:5:10:30 | {...} |
+| Dynamic/DynamicExecutionWithFunc.ps1:9:6:9:12 | $foo | Dynamic/DynamicExecutionWithFunc.ps1:9:5:9:12 | call |
 | Dynamic/DynamicExecutionWithFunc.ps1:9:7:9:11 | foo | Dynamic/DynamicExecutionWithFunc.ps1:9:6:9:12 | $foo |
-| Dynamic/DynamicExecutionWithFunc.ps1:10:5:10:30 | cmd.exe | Dynamic/DynamicExecutionWithFunc.ps1:2:5:10:30 | {...} |
-| Dynamic/DynamicExecutionWithFunc.ps1:10:7:10:16 | cmd.exe | Dynamic/DynamicExecutionWithFunc.ps1:10:5:10:30 | cmd.exe |
-| Dynamic/DynamicExecutionWithFunc.ps1:10:17:10:30 | @(...) | Dynamic/DynamicExecutionWithFunc.ps1:10:5:10:30 | cmd.exe |
+| Dynamic/DynamicExecutionWithFunc.ps1:10:5:10:30 | call to cmd.exe | Dynamic/DynamicExecutionWithFunc.ps1:2:5:10:30 | {...} |
+| Dynamic/DynamicExecutionWithFunc.ps1:10:7:10:16 | cmd.exe | Dynamic/DynamicExecutionWithFunc.ps1:10:5:10:30 | call to cmd.exe |
+| Dynamic/DynamicExecutionWithFunc.ps1:10:17:10:30 | @(...) | Dynamic/DynamicExecutionWithFunc.ps1:10:5:10:30 | call to cmd.exe |
 | Dynamic/DynamicExecutionWithFunc.ps1:10:19:10:29 | userInput | Dynamic/DynamicExecutionWithFunc.ps1:10:19:10:29 | userInput |
 | Dynamic/DynamicExecutionWithFunc.ps1:10:19:10:29 | userInput | Dynamic/DynamicExecutionWithFunc.ps1:10:19:10:29 | {...} |
 | Dynamic/DynamicExecutionWithFunc.ps1:10:19:10:29 | {...} | Dynamic/DynamicExecutionWithFunc.ps1:10:17:10:30 | @(...) |
@@ -172,17 +172,17 @@
 | Expressions/ConvertWithSecureString.ps1:1:1:1:11 | UserInput | Expressions/ConvertWithSecureString.ps1:1:1:1:55 | ...=... |
 | Expressions/ConvertWithSecureString.ps1:1:1:1:55 | ...=... | Expressions/ConvertWithSecureString.ps1:1:1:2:80 | {...} |
 | Expressions/ConvertWithSecureString.ps1:1:1:2:80 | {...} | Expressions/ConvertWithSecureString.ps1:1:1:2:80 | ConvertWithSecureString.ps1 |
-| Expressions/ConvertWithSecureString.ps1:1:14:1:23 | Read-Host | Expressions/ConvertWithSecureString.ps1:1:14:1:55 | Read-Host |
-| Expressions/ConvertWithSecureString.ps1:1:14:1:55 | Read-Host | Expressions/ConvertWithSecureString.ps1:1:1:1:55 | ...=... |
-| Expressions/ConvertWithSecureString.ps1:1:24:1:55 | Please enter your secure code | Expressions/ConvertWithSecureString.ps1:1:14:1:55 | Read-Host |
+| Expressions/ConvertWithSecureString.ps1:1:14:1:23 | Read-Host | Expressions/ConvertWithSecureString.ps1:1:14:1:55 | call to Read-Host |
+| Expressions/ConvertWithSecureString.ps1:1:14:1:55 | call to Read-Host | Expressions/ConvertWithSecureString.ps1:1:1:1:55 | ...=... |
+| Expressions/ConvertWithSecureString.ps1:1:24:1:55 | Please enter your secure code | Expressions/ConvertWithSecureString.ps1:1:14:1:55 | call to Read-Host |
 | Expressions/ConvertWithSecureString.ps1:2:1:2:16 | EncryptedInput | Expressions/ConvertWithSecureString.ps1:2:1:2:80 | ...=... |
 | Expressions/ConvertWithSecureString.ps1:2:1:2:80 | ...=... | Expressions/ConvertWithSecureString.ps1:1:1:2:80 | {...} |
-| Expressions/ConvertWithSecureString.ps1:2:19:2:41 | ConvertTo-SecureString | Expressions/ConvertWithSecureString.ps1:2:19:2:80 | ConvertTo-SecureString |
-| Expressions/ConvertWithSecureString.ps1:2:19:2:80 | ConvertTo-SecureString | Expressions/ConvertWithSecureString.ps1:2:1:2:80 | ...=... |
-| Expressions/ConvertWithSecureString.ps1:2:42:2:49 | String | Expressions/ConvertWithSecureString.ps1:2:19:2:80 | ConvertTo-SecureString |
-| Expressions/ConvertWithSecureString.ps1:2:50:2:60 | UserInput | Expressions/ConvertWithSecureString.ps1:2:19:2:80 | ConvertTo-SecureString |
-| Expressions/ConvertWithSecureString.ps1:2:61:2:73 | AsPlainText | Expressions/ConvertWithSecureString.ps1:2:19:2:80 | ConvertTo-SecureString |
-| Expressions/ConvertWithSecureString.ps1:2:74:2:80 | Force | Expressions/ConvertWithSecureString.ps1:2:19:2:80 | ConvertTo-SecureString |
+| Expressions/ConvertWithSecureString.ps1:2:19:2:41 | ConvertTo-SecureString | Expressions/ConvertWithSecureString.ps1:2:19:2:80 | call to ConvertTo-SecureString |
+| Expressions/ConvertWithSecureString.ps1:2:19:2:80 | call to ConvertTo-SecureString | Expressions/ConvertWithSecureString.ps1:2:1:2:80 | ...=... |
+| Expressions/ConvertWithSecureString.ps1:2:42:2:49 | String | Expressions/ConvertWithSecureString.ps1:2:19:2:80 | call to ConvertTo-SecureString |
+| Expressions/ConvertWithSecureString.ps1:2:50:2:60 | UserInput | Expressions/ConvertWithSecureString.ps1:2:19:2:80 | call to ConvertTo-SecureString |
+| Expressions/ConvertWithSecureString.ps1:2:61:2:73 | AsPlainText | Expressions/ConvertWithSecureString.ps1:2:19:2:80 | call to ConvertTo-SecureString |
+| Expressions/ConvertWithSecureString.ps1:2:74:2:80 | Force | Expressions/ConvertWithSecureString.ps1:2:19:2:80 | call to ConvertTo-SecureString |
 | Expressions/ExpandableString.ps1:1:1:1:40 | Date: $([DateTime]::Now)\nName: $name | Expressions/ExpandableString.ps1:1:1:1:40 | Date: $([DateTime]::Now)\nName: $name |
 | Expressions/ExpandableString.ps1:1:1:1:40 | Date: $([DateTime]::Now)\nName: $name | Expressions/ExpandableString.ps1:1:1:1:40 | {...} |
 | Expressions/ExpandableString.ps1:1:1:1:40 | {...} | Expressions/ExpandableString.ps1:1:1:1:40 | ExpandableString.ps1 |
@@ -197,16 +197,16 @@
 | Expressions/SubExpression.ps1:1:1:1:24 | call to AddDays | Expressions/SubExpression.ps1:1:1:1:24 | call to AddDays |
 | Expressions/SubExpression.ps1:1:1:1:24 | call to AddDays | Expressions/SubExpression.ps1:1:1:2:22 | {...} |
 | Expressions/SubExpression.ps1:1:1:2:22 | {...} | Expressions/SubExpression.ps1:1:1:2:22 | SubExpression.ps1 |
-| Expressions/SubExpression.ps1:1:3:1:11 | Get-Date | Expressions/SubExpression.ps1:1:3:1:11 | Get-Date |
-| Expressions/SubExpression.ps1:1:3:1:11 | Get-Date | Expressions/SubExpression.ps1:1:3:1:11 | {...} |
+| Expressions/SubExpression.ps1:1:3:1:11 | Get-Date | Expressions/SubExpression.ps1:1:3:1:11 | call to Get-Date |
+| Expressions/SubExpression.ps1:1:3:1:11 | call to Get-Date | Expressions/SubExpression.ps1:1:3:1:11 | {...} |
 | Expressions/SubExpression.ps1:1:3:1:11 | {...} | Expressions/SubExpression.ps1:1:1:1:12 | $(...) |
 | Expressions/SubExpression.ps1:1:13:1:20 | AddDays | Expressions/SubExpression.ps1:1:1:1:24 | call to AddDays |
 | Expressions/SubExpression.ps1:1:21:1:23 | 10 | Expressions/SubExpression.ps1:1:1:1:24 | call to AddDays |
 | Expressions/SubExpression.ps1:2:1:2:12 | $(...) | Expressions/SubExpression.ps1:2:1:2:22 | call to AddDays |
 | Expressions/SubExpression.ps1:2:1:2:22 | call to AddDays | Expressions/SubExpression.ps1:1:1:2:22 | {...} |
 | Expressions/SubExpression.ps1:2:1:2:22 | call to AddDays | Expressions/SubExpression.ps1:2:1:2:22 | call to AddDays |
-| Expressions/SubExpression.ps1:2:3:2:11 | Get-Date | Expressions/SubExpression.ps1:2:3:2:11 | Get-Date |
-| Expressions/SubExpression.ps1:2:3:2:11 | Get-Date | Expressions/SubExpression.ps1:2:3:2:11 | {...} |
+| Expressions/SubExpression.ps1:2:3:2:11 | Get-Date | Expressions/SubExpression.ps1:2:3:2:11 | call to Get-Date |
+| Expressions/SubExpression.ps1:2:3:2:11 | call to Get-Date | Expressions/SubExpression.ps1:2:3:2:11 | {...} |
 | Expressions/SubExpression.ps1:2:3:2:11 | {...} | Expressions/SubExpression.ps1:2:1:2:12 | $(...) |
 | Expressions/SubExpression.ps1:2:13:2:20 | AddDays | Expressions/SubExpression.ps1:2:1:2:22 | call to AddDays |
 | Expressions/TernaryExpression.ps1:1:1:1:5 | var | Expressions/TernaryExpression.ps1:1:1:1:23 | ...=... |
@@ -268,14 +268,14 @@
 | Loops/While.ps1:2:8:2:18 | ... -le ... | Loops/While.ps1:2:8:2:18 | ... -le ... |
 | Loops/While.ps1:2:17:2:18 | 5 | Loops/While.ps1:2:8:2:18 | ... -le ... |
 | Loops/While.ps1:3:1:13:2 | {...} | Loops/While.ps1:2:1:13:2 | while(...) {...} |
-| Loops/While.ps1:4:5:4:15 | Write-Host | Loops/While.ps1:4:5:4:41 | Write-Host |
-| Loops/While.ps1:4:5:4:41 | Write-Host | Loops/While.ps1:3:1:13:2 | {...} |
-| Loops/While.ps1:4:16:4:19 | The | Loops/While.ps1:4:5:4:41 | Write-Host |
-| Loops/While.ps1:4:20:4:25 | value | Loops/While.ps1:4:5:4:41 | Write-Host |
-| Loops/While.ps1:4:26:4:28 | of | Loops/While.ps1:4:5:4:41 | Write-Host |
-| Loops/While.ps1:4:29:4:32 | Var | Loops/While.ps1:4:5:4:41 | Write-Host |
-| Loops/While.ps1:4:33:4:36 | is: | Loops/While.ps1:4:5:4:41 | Write-Host |
-| Loops/While.ps1:4:37:4:41 | var | Loops/While.ps1:4:5:4:41 | Write-Host |
+| Loops/While.ps1:4:5:4:15 | Write-Host | Loops/While.ps1:4:5:4:41 | call to Write-Host |
+| Loops/While.ps1:4:5:4:41 | call to Write-Host | Loops/While.ps1:3:1:13:2 | {...} |
+| Loops/While.ps1:4:16:4:19 | The | Loops/While.ps1:4:5:4:41 | call to Write-Host |
+| Loops/While.ps1:4:20:4:25 | value | Loops/While.ps1:4:5:4:41 | call to Write-Host |
+| Loops/While.ps1:4:26:4:28 | of | Loops/While.ps1:4:5:4:41 | call to Write-Host |
+| Loops/While.ps1:4:29:4:32 | Var | Loops/While.ps1:4:5:4:41 | call to Write-Host |
+| Loops/While.ps1:4:33:4:36 | is: | Loops/While.ps1:4:5:4:41 | call to Write-Host |
+| Loops/While.ps1:4:37:4:41 | var | Loops/While.ps1:4:5:4:41 | call to Write-Host |
 | Loops/While.ps1:5:5:5:9 | var | Loops/While.ps1:5:5:5:11 | ...++ |
 | Loops/While.ps1:5:5:5:11 | ...++ | Loops/While.ps1:3:1:13:2 | {...} |
 | Loops/While.ps1:5:5:5:11 | ...++ | Loops/While.ps1:5:5:5:11 | ...++ |
@@ -291,13 +291,13 @@
 | Redirections/FileRedirection.ps1:1:1:3:2 | $(...) | Redirections/FileRedirection.ps1:1:1:3:20 | $(...) |
 | Redirections/FileRedirection.ps1:1:1:3:20 | $(...) | Redirections/FileRedirection.ps1:1:1:3:20 | {...} |
 | Redirections/FileRedirection.ps1:1:1:3:20 | {...} | Redirections/FileRedirection.ps1:1:1:3:20 | FileRedirection.ps1 |
-| Redirections/FileRedirection.ps1:2:5:2:9 | Here | Redirections/FileRedirection.ps1:2:5:2:32 | Here |
-| Redirections/FileRedirection.ps1:2:5:2:32 | Here | Redirections/FileRedirection.ps1:2:5:2:32 | {...} |
+| Redirections/FileRedirection.ps1:2:5:2:9 | Here | Redirections/FileRedirection.ps1:2:5:2:32 | call to Here |
+| Redirections/FileRedirection.ps1:2:5:2:32 | call to Here | Redirections/FileRedirection.ps1:2:5:2:32 | {...} |
 | Redirections/FileRedirection.ps1:2:5:2:32 | {...} | Redirections/FileRedirection.ps1:1:1:3:2 | $(...) |
-| Redirections/FileRedirection.ps1:2:10:2:12 | is | Redirections/FileRedirection.ps1:2:5:2:32 | Here |
-| Redirections/FileRedirection.ps1:2:13:2:17 | your | Redirections/FileRedirection.ps1:2:5:2:32 | Here |
-| Redirections/FileRedirection.ps1:2:18:2:25 | current | Redirections/FileRedirection.ps1:2:5:2:32 | Here |
-| Redirections/FileRedirection.ps1:2:26:2:32 | script | Redirections/FileRedirection.ps1:2:5:2:32 | Here |
+| Redirections/FileRedirection.ps1:2:10:2:12 | is | Redirections/FileRedirection.ps1:2:5:2:32 | call to Here |
+| Redirections/FileRedirection.ps1:2:13:2:17 | your | Redirections/FileRedirection.ps1:2:5:2:32 | call to Here |
+| Redirections/FileRedirection.ps1:2:18:2:25 | current | Redirections/FileRedirection.ps1:2:5:2:32 | call to Here |
+| Redirections/FileRedirection.ps1:2:26:2:32 | script | Redirections/FileRedirection.ps1:2:5:2:32 | call to Here |
 | Redirections/FileRedirection.ps1:3:3:3:7 | MergingRedirection | Redirections/FileRedirection.ps1:1:1:3:20 | $(...) |
 | Redirections/FileRedirection.ps1:3:8:3:20 | FileRedirection | Redirections/FileRedirection.ps1:1:1:3:20 | $(...) |
 | Redirections/FileRedirection.ps1:3:10:3:20 | output.txt | Redirections/FileRedirection.ps1:3:8:3:20 | FileRedirection |
@@ -331,20 +331,20 @@
 | Statements/TrapStatement.ps1:2:10:2:26 | {...} | Statements/TrapStatement.ps1:2:5:2:26 | TrapStatement at: Statements/TrapStatement.ps1:2:5:2:26 |
 | Statements/TrapStatement.ps1:2:11:2:25 | Error found. | Statements/TrapStatement.ps1:2:10:2:26 | {...} |
 | Statements/TrapStatement.ps1:2:11:2:25 | Error found. | Statements/TrapStatement.ps1:2:11:2:25 | Error found. |
-| Statements/TrapStatement.ps1:3:5:3:19 | nonsenseString | Statements/TrapStatement.ps1:2:5:3:19 | {...} |
-| Statements/TrapStatement.ps1:3:5:3:19 | nonsenseString | Statements/TrapStatement.ps1:3:5:3:19 | nonsenseString |
-| Statements/TrapStatement.ps1:6:1:6:9 | TrapTest | Statements/TrapStatement.ps1:1:1:6:9 | {...} |
-| Statements/TrapStatement.ps1:6:1:6:9 | TrapTest | Statements/TrapStatement.ps1:6:1:6:9 | TrapTest |
+| Statements/TrapStatement.ps1:3:5:3:19 | call to nonsenseString | Statements/TrapStatement.ps1:2:5:3:19 | {...} |
+| Statements/TrapStatement.ps1:3:5:3:19 | nonsenseString | Statements/TrapStatement.ps1:3:5:3:19 | call to nonsenseString |
+| Statements/TrapStatement.ps1:6:1:6:9 | TrapTest | Statements/TrapStatement.ps1:6:1:6:9 | call to TrapTest |
+| Statements/TrapStatement.ps1:6:1:6:9 | call to TrapTest | Statements/TrapStatement.ps1:1:1:6:9 | {...} |
 | Statements/Try.ps1:1:1:13:2 | try {...} | Statements/Try.ps1:1:1:13:2 | {...} |
 | Statements/Try.ps1:1:1:13:2 | {...} | Statements/Try.ps1:1:1:13:2 | Try.ps1 |
 | Statements/Try.ps1:1:5:4:2 | {...} | Statements/Try.ps1:1:1:13:2 | try {...} |
 | Statements/Try.ps1:2:4:2:14 | Exception | Statements/Try.ps1:2:4:2:95 | ...=... |
 | Statements/Try.ps1:2:4:2:95 | ...=... | Statements/Try.ps1:1:5:4:2 | {...} |
-| Statements/Try.ps1:2:17:2:27 | New-Object | Statements/Try.ps1:2:17:2:95 | New-Object |
-| Statements/Try.ps1:2:17:2:95 | New-Object | Statements/Try.ps1:2:4:2:95 | ...=... |
-| Statements/Try.ps1:2:28:2:53 | System.Xaml.XamlException | Statements/Try.ps1:2:17:2:95 | New-Object |
-| Statements/Try.ps1:2:54:2:67 | ArgumentList | Statements/Try.ps1:2:17:2:95 | New-Object |
-| Statements/Try.ps1:2:68:2:95 | (...) | Statements/Try.ps1:2:17:2:95 | New-Object |
+| Statements/Try.ps1:2:17:2:27 | New-Object | Statements/Try.ps1:2:17:2:95 | call to New-Object |
+| Statements/Try.ps1:2:17:2:95 | call to New-Object | Statements/Try.ps1:2:4:2:95 | ...=... |
+| Statements/Try.ps1:2:28:2:53 | System.Xaml.XamlException | Statements/Try.ps1:2:17:2:95 | call to New-Object |
+| Statements/Try.ps1:2:54:2:67 | ArgumentList | Statements/Try.ps1:2:17:2:95 | call to New-Object |
+| Statements/Try.ps1:2:68:2:95 | (...) | Statements/Try.ps1:2:17:2:95 | call to New-Object |
 | Statements/Try.ps1:2:69:2:80 | Bad XAML! | Statements/Try.ps1:2:69:2:94 | ...,... |
 | Statements/Try.ps1:2:69:2:94 | ...,... | Statements/Try.ps1:2:68:2:95 | (...) |
 | Statements/Try.ps1:2:69:2:94 | ...,... | Statements/Try.ps1:2:69:2:94 | ...,... |
diff --git a/powershell/ql/test/library-tests/controlflow/graph/Cfg.expected b/powershell/ql/test/library-tests/controlflow/graph/Cfg.expected
index 29113b4a9c4..65f28412b3a 100644
--- a/powershell/ql/test/library-tests/controlflow/graph/Cfg.expected
+++ b/powershell/ql/test/library-tests/controlflow/graph/Cfg.expected
@@ -45,9 +45,11 @@
 | conditionals.ps1:25:5:31:14 | {...} | conditionals.ps1:27:5:30:6 | if (...) {...} |  |
 | conditionals.ps1:27:5:30:6 | if (...) {...} | conditionals.ps1:27:8:27:16 | myBool1 |  |
 | conditionals.ps1:27:8:27:16 | myBool1 | conditionals.ps1:27:22:27:30 | myBool2 | false, true |
-| conditionals.ps1:27:8:27:30 | ... -and ... | conditionals.ps1:27:8:27:30 | ... -and ... | false, true |
 | conditionals.ps1:27:8:27:30 | ... -and ... | conditionals.ps1:28:5:30:6 | {...} | true |
-| conditionals.ps1:27:22:27:30 | myBool2 | conditionals.ps1:27:8:27:30 | ... -and ... | false, true |
+| conditionals.ps1:27:8:27:30 | [false] ... -and ... | conditionals.ps1:27:8:27:30 | ... -and ... | false |
+| conditionals.ps1:27:8:27:30 | [true] ... -and ... | conditionals.ps1:27:8:27:30 | ... -and ... | true |
+| conditionals.ps1:27:22:27:30 | myBool2 | conditionals.ps1:27:8:27:30 | [false] ... -and ... | false |
+| conditionals.ps1:27:22:27:30 | myBool2 | conditionals.ps1:27:8:27:30 | [true] ... -and ... | true |
 | conditionals.ps1:28:5:30:6 | {...} | conditionals.ps1:29:9:29:18 | return ... |  |
 | conditionals.ps1:29:9:29:18 | return ... | conditionals.ps1:29:16:29:18 | 10 |  |
 | conditionals.ps1:29:16:29:18 | 10 | conditionals.ps1:29:16:29:18 | 10 |  |
@@ -63,10 +65,12 @@
 | conditionals.ps1:35:5:44:6 | {...} | conditionals.ps1:37:5:44:6 | if (...) {...} else {...} |  |
 | conditionals.ps1:37:5:44:6 | if (...) {...} else {...} | conditionals.ps1:37:8:37:16 | myBool1 |  |
 | conditionals.ps1:37:8:37:16 | myBool1 | conditionals.ps1:37:22:37:30 | myBool2 | false, true |
-| conditionals.ps1:37:8:37:30 | ... -and ... | conditionals.ps1:37:8:37:30 | ... -and ... | false, true |
 | conditionals.ps1:37:8:37:30 | ... -and ... | conditionals.ps1:38:5:40:6 | {...} | true |
 | conditionals.ps1:37:8:37:30 | ... -and ... | conditionals.ps1:42:5:44:6 | {...} | false |
-| conditionals.ps1:37:22:37:30 | myBool2 | conditionals.ps1:37:8:37:30 | ... -and ... | false, true |
+| conditionals.ps1:37:8:37:30 | [false] ... -and ... | conditionals.ps1:37:8:37:30 | ... -and ... | false |
+| conditionals.ps1:37:8:37:30 | [true] ... -and ... | conditionals.ps1:37:8:37:30 | ... -and ... | true |
+| conditionals.ps1:37:22:37:30 | myBool2 | conditionals.ps1:37:8:37:30 | [false] ... -and ... | false |
+| conditionals.ps1:37:22:37:30 | myBool2 | conditionals.ps1:37:8:37:30 | [true] ... -and ... | true |
 | conditionals.ps1:38:5:40:6 | {...} | conditionals.ps1:39:9:39:18 | return ... |  |
 | conditionals.ps1:39:9:39:18 | return ... | conditionals.ps1:39:16:39:18 | 10 |  |
 | conditionals.ps1:39:16:39:18 | 10 | conditionals.ps1:34:28:45:2 | exit {...} (normal) |  |
@@ -83,9 +87,11 @@
 | conditionals.ps1:48:5:54:14 | {...} | conditionals.ps1:50:5:53:6 | if (...) {...} |  |
 | conditionals.ps1:50:5:53:6 | if (...) {...} | conditionals.ps1:50:8:50:16 | myBool1 |  |
 | conditionals.ps1:50:8:50:16 | myBool1 | conditionals.ps1:50:21:50:29 | myBool2 | false, true |
-| conditionals.ps1:50:8:50:29 | ... -or ... | conditionals.ps1:50:8:50:29 | ... -or ... | false, true |
 | conditionals.ps1:50:8:50:29 | ... -or ... | conditionals.ps1:51:5:53:6 | {...} | true |
-| conditionals.ps1:50:21:50:29 | myBool2 | conditionals.ps1:50:8:50:29 | ... -or ... | false, true |
+| conditionals.ps1:50:8:50:29 | [false] ... -or ... | conditionals.ps1:50:8:50:29 | ... -or ... | false |
+| conditionals.ps1:50:8:50:29 | [true] ... -or ... | conditionals.ps1:50:8:50:29 | ... -or ... | true |
+| conditionals.ps1:50:21:50:29 | myBool2 | conditionals.ps1:50:8:50:29 | [false] ... -or ... | false |
+| conditionals.ps1:50:21:50:29 | myBool2 | conditionals.ps1:50:8:50:29 | [true] ... -or ... | true |
 | conditionals.ps1:51:5:53:6 | {...} | conditionals.ps1:52:9:52:18 | return ... |  |
 | conditionals.ps1:52:9:52:18 | return ... | conditionals.ps1:52:16:52:18 | 10 |  |
 | conditionals.ps1:52:16:52:18 | 10 | conditionals.ps1:52:16:52:18 | 10 |  |
@@ -101,10 +107,12 @@
 | conditionals.ps1:58:5:67:6 | {...} | conditionals.ps1:60:5:67:6 | if (...) {...} else {...} |  |
 | conditionals.ps1:60:5:67:6 | if (...) {...} else {...} | conditionals.ps1:60:8:60:16 | myBool1 |  |
 | conditionals.ps1:60:8:60:16 | myBool1 | conditionals.ps1:60:21:60:29 | myBool2 | false, true |
-| conditionals.ps1:60:8:60:29 | ... -or ... | conditionals.ps1:60:8:60:29 | ... -or ... | false, true |
 | conditionals.ps1:60:8:60:29 | ... -or ... | conditionals.ps1:61:5:63:6 | {...} | true |
 | conditionals.ps1:60:8:60:29 | ... -or ... | conditionals.ps1:65:5:67:6 | {...} | false |
-| conditionals.ps1:60:21:60:29 | myBool2 | conditionals.ps1:60:8:60:29 | ... -or ... | false, true |
+| conditionals.ps1:60:8:60:29 | [false] ... -or ... | conditionals.ps1:60:8:60:29 | ... -or ... | false |
+| conditionals.ps1:60:8:60:29 | [true] ... -or ... | conditionals.ps1:60:8:60:29 | ... -or ... | true |
+| conditionals.ps1:60:21:60:29 | myBool2 | conditionals.ps1:60:8:60:29 | [false] ... -or ... | false |
+| conditionals.ps1:60:21:60:29 | myBool2 | conditionals.ps1:60:8:60:29 | [true] ... -or ... | true |
 | conditionals.ps1:61:5:63:6 | {...} | conditionals.ps1:62:9:62:18 | return ... |  |
 | conditionals.ps1:62:9:62:18 | return ... | conditionals.ps1:62:16:62:18 | 10 |  |
 | conditionals.ps1:62:16:62:18 | 10 | conditionals.ps1:57:28:68:2 | exit {...} (normal) |  |
@@ -122,10 +130,17 @@
 | conditionals.ps1:73:5:80:6 | if (...) {...} | conditionals.ps1:73:8:73:16 | myBool1 |  |
 | conditionals.ps1:73:8:73:16 | myBool1 | conditionals.ps1:73:8:73:16 | myBool1 | false, true |
 | conditionals.ps1:73:8:73:16 | myBool1 | conditionals.ps1:74:5:76:6 | {...} | true |
+| conditionals.ps1:73:8:73:16 | myBool1 | conditionals.ps1:77:12:77:19 | myBoo2 | false |
 | conditionals.ps1:74:5:76:6 | {...} | conditionals.ps1:75:9:75:18 | return ... |  |
 | conditionals.ps1:75:9:75:18 | return ... | conditionals.ps1:75:16:75:18 | 10 |  |
 | conditionals.ps1:75:16:75:18 | 10 | conditionals.ps1:75:16:75:18 | 10 |  |
 | conditionals.ps1:75:16:75:18 | 10 | conditionals.ps1:81:5:81:14 | return ... |  |
+| conditionals.ps1:77:12:77:19 | myBoo2 | conditionals.ps1:77:12:77:19 | myBoo2 | false, true |
+| conditionals.ps1:77:12:77:19 | myBoo2 | conditionals.ps1:78:5:80:6 | {...} | true |
+| conditionals.ps1:78:5:80:6 | {...} | conditionals.ps1:79:9:79:18 | return ... |  |
+| conditionals.ps1:79:9:79:18 | return ... | conditionals.ps1:79:16:79:18 | 11 |  |
+| conditionals.ps1:79:16:79:18 | 11 | conditionals.ps1:79:16:79:18 | 11 |  |
+| conditionals.ps1:79:16:79:18 | 11 | conditionals.ps1:81:5:81:14 | return ... |  |
 | conditionals.ps1:81:5:81:14 | return ... | conditionals.ps1:81:12:81:14 | 12 |  |
 | conditionals.ps1:81:12:81:14 | 12 | conditionals.ps1:70:23:82:2 | exit {...} (normal) |  |
 | conditionals.ps1:81:12:81:14 | 12 | conditionals.ps1:81:12:81:14 | 12 |  |
@@ -138,11 +153,18 @@
 | conditionals.ps1:87:5:98:6 | if (...) {...} else {...} | conditionals.ps1:87:8:87:16 | myBool1 |  |
 | conditionals.ps1:87:8:87:16 | myBool1 | conditionals.ps1:87:8:87:16 | myBool1 | false, true |
 | conditionals.ps1:87:8:87:16 | myBool1 | conditionals.ps1:88:5:90:6 | {...} | true |
-| conditionals.ps1:87:8:87:16 | myBool1 | conditionals.ps1:96:5:98:6 | {...} | false |
+| conditionals.ps1:87:8:87:16 | myBool1 | conditionals.ps1:91:12:91:19 | myBoo2 | false |
 | conditionals.ps1:88:5:90:6 | {...} | conditionals.ps1:89:9:89:18 | return ... |  |
 | conditionals.ps1:89:9:89:18 | return ... | conditionals.ps1:89:16:89:18 | 10 |  |
 | conditionals.ps1:89:16:89:18 | 10 | conditionals.ps1:84:28:99:2 | exit {...} (normal) |  |
 | conditionals.ps1:89:16:89:18 | 10 | conditionals.ps1:89:16:89:18 | 10 |  |
+| conditionals.ps1:91:12:91:19 | myBoo2 | conditionals.ps1:91:12:91:19 | myBoo2 | false, true |
+| conditionals.ps1:91:12:91:19 | myBoo2 | conditionals.ps1:92:5:94:6 | {...} | true |
+| conditionals.ps1:91:12:91:19 | myBoo2 | conditionals.ps1:96:5:98:6 | {...} | false |
+| conditionals.ps1:92:5:94:6 | {...} | conditionals.ps1:93:9:93:18 | return ... |  |
+| conditionals.ps1:93:9:93:18 | return ... | conditionals.ps1:93:16:93:18 | 11 |  |
+| conditionals.ps1:93:16:93:18 | 11 | conditionals.ps1:84:28:99:2 | exit {...} (normal) |  |
+| conditionals.ps1:93:16:93:18 | 11 | conditionals.ps1:93:16:93:18 | 11 |  |
 | conditionals.ps1:96:5:98:6 | {...} | conditionals.ps1:97:9:97:18 | return ... |  |
 | conditionals.ps1:97:9:97:18 | return ... | conditionals.ps1:97:16:97:18 | 12 |  |
 | conditionals.ps1:97:16:97:18 | 12 | conditionals.ps1:84:28:99:2 | exit {...} (normal) |  |
@@ -203,8 +225,8 @@
 | conditionals.ps1:116:9:116:17 | default: | conditionals.ps1:116:18:119:10 | {...} | true |
 | conditionals.ps1:116:18:119:10 | {...} | conditionals.ps1:117:13:117:25 | Write-Output |  |
 | conditionals.ps1:117:13:117:25 | Write-Output | conditionals.ps1:117:26:117:34 | Error! |  |
-| conditionals.ps1:117:13:117:34 | Write-Output | conditionals.ps1:118:13:118:21 | return ... |  |
-| conditionals.ps1:117:26:117:34 | Error! | conditionals.ps1:117:13:117:34 | Write-Output |  |
+| conditionals.ps1:117:13:117:34 | call to Write-Output | conditionals.ps1:118:13:118:21 | return ... |  |
+| conditionals.ps1:117:26:117:34 | Error! | conditionals.ps1:117:13:117:34 | call to Write-Output |  |
 | conditionals.ps1:118:13:118:21 | return ... | conditionals.ps1:118:20:118:21 | 3 |  |
 | conditionals.ps1:118:20:118:21 | 3 | conditionals.ps1:110:34:121:2 | exit {...} (normal) |  |
 | conditionals.ps1:118:20:118:21 | 3 | conditionals.ps1:118:20:118:21 | 3 |  |
@@ -527,8 +549,8 @@
 | try.ps1:2:5:7:13 | {...} | try.ps1:2:5:6:6 | try {...} |  |
 | try.ps1:2:9:4:6 | {...} | try.ps1:3:9:3:21 | Write-Output |  |
 | try.ps1:3:9:3:21 | Write-Output | try.ps1:3:22:3:30 | Hello! |  |
-| try.ps1:3:9:3:30 | Write-Output | try.ps1:7:5:7:13 | return ... |  |
-| try.ps1:3:22:3:30 | Hello! | try.ps1:3:9:3:30 | Write-Output |  |
+| try.ps1:3:9:3:30 | call to Write-Output | try.ps1:7:5:7:13 | return ... |  |
+| try.ps1:3:22:3:30 | Hello! | try.ps1:3:9:3:30 | call to Write-Output |  |
 | try.ps1:7:5:7:13 | return ... | try.ps1:7:12:7:13 | 1 |  |
 | try.ps1:7:12:7:13 | 1 | try.ps1:1:25:8:2 | exit {...} (normal) |  |
 | try.ps1:7:12:7:13 | 1 | try.ps1:7:12:7:13 | 1 |  |
@@ -591,8 +613,8 @@
 | try.ps1:44:5:49:13 | {...} | try.ps1:44:5:48:6 | try {...} |  |
 | try.ps1:44:9:46:6 | {...} | try.ps1:45:9:45:21 | Write-Output |  |
 | try.ps1:45:9:45:21 | Write-Output | try.ps1:45:22:45:30 | Hello! |  |
-| try.ps1:45:9:45:30 | Write-Output | try.ps1:49:5:49:13 | return ... |  |
-| try.ps1:45:22:45:30 | Hello! | try.ps1:45:9:45:30 | Write-Output |  |
+| try.ps1:45:9:45:30 | call to Write-Output | try.ps1:49:5:49:13 | return ... |  |
+| try.ps1:45:22:45:30 | Hello! | try.ps1:45:9:45:30 | call to Write-Output |  |
 | try.ps1:49:5:49:13 | return ... | try.ps1:49:12:49:13 | 1 |  |
 | try.ps1:49:12:49:13 | 1 | try.ps1:43:36:50:2 | exit {...} (normal) |  |
 | try.ps1:49:12:49:13 | 1 | try.ps1:49:12:49:13 | 1 |  |
@@ -604,8 +626,8 @@
 | try.ps1:53:5:58:13 | {...} | try.ps1:53:5:57:6 | try {...} |  |
 | try.ps1:53:9:55:6 | {...} | try.ps1:54:9:54:21 | Write-Output |  |
 | try.ps1:54:9:54:21 | Write-Output | try.ps1:54:22:54:30 | Hello! |  |
-| try.ps1:54:9:54:30 | Write-Output | try.ps1:58:5:58:13 | return ... |  |
-| try.ps1:54:22:54:30 | Hello! | try.ps1:54:9:54:30 | Write-Output |  |
+| try.ps1:54:9:54:30 | call to Write-Output | try.ps1:58:5:58:13 | return ... |  |
+| try.ps1:54:22:54:30 | Hello! | try.ps1:54:9:54:30 | call to Write-Output |  |
 | try.ps1:58:5:58:13 | return ... | try.ps1:58:12:58:13 | 1 |  |
 | try.ps1:58:12:58:13 | 1 | try.ps1:52:36:59:2 | exit {...} (normal) |  |
 | try.ps1:58:12:58:13 | 1 | try.ps1:58:12:58:13 | 1 |  |
@@ -617,8 +639,8 @@
 | try.ps1:62:5:69:13 | {...} | try.ps1:62:5:68:6 | try {...} |  |
 | try.ps1:62:9:64:6 | {...} | try.ps1:63:9:63:21 | Write-Output |  |
 | try.ps1:63:9:63:21 | Write-Output | try.ps1:63:22:63:30 | Hello! |  |
-| try.ps1:63:9:63:30 | Write-Output | try.ps1:69:5:69:13 | return ... |  |
-| try.ps1:63:22:63:30 | Hello! | try.ps1:63:9:63:30 | Write-Output |  |
+| try.ps1:63:9:63:30 | call to Write-Output | try.ps1:69:5:69:13 | return ... |  |
+| try.ps1:63:22:63:30 | Hello! | try.ps1:63:9:63:30 | call to Write-Output |  |
 | try.ps1:69:5:69:13 | return ... | try.ps1:69:12:69:13 | 2 |  |
 | try.ps1:69:12:69:13 | 2 | try.ps1:61:40:70:2 | exit {...} (normal) |  |
 | try.ps1:69:12:69:13 | 2 | try.ps1:69:12:69:13 | 2 |  |
@@ -630,8 +652,8 @@
 | try.ps1:73:5:78:13 | {...} | try.ps1:73:5:77:6 | try {...} |  |
 | try.ps1:73:9:75:6 | {...} | try.ps1:74:9:74:21 | Write-Output |  |
 | try.ps1:74:9:74:21 | Write-Output | try.ps1:74:22:74:30 | Hello! |  |
-| try.ps1:74:9:74:30 | Write-Output | try.ps1:78:5:78:13 | return ... |  |
-| try.ps1:74:22:74:30 | Hello! | try.ps1:74:9:74:30 | Write-Output |  |
+| try.ps1:74:9:74:30 | call to Write-Output | try.ps1:78:5:78:13 | return ... |  |
+| try.ps1:74:22:74:30 | Hello! | try.ps1:74:9:74:30 | call to Write-Output |  |
 | try.ps1:78:5:78:13 | return ... | try.ps1:78:12:78:13 | 1 |  |
 | try.ps1:78:12:78:13 | 1 | try.ps1:72:36:79:2 | exit {...} (normal) |  |
 | try.ps1:78:12:78:13 | 1 | try.ps1:78:12:78:13 | 1 |  |
@@ -643,8 +665,8 @@
 | try.ps1:82:5:89:13 | {...} | try.ps1:82:5:88:6 | try {...} |  |
 | try.ps1:82:9:84:6 | {...} | try.ps1:83:9:83:21 | Write-Output |  |
 | try.ps1:83:9:83:21 | Write-Output | try.ps1:83:22:83:30 | Hello! |  |
-| try.ps1:83:9:83:30 | Write-Output | try.ps1:89:5:89:13 | return ... |  |
-| try.ps1:83:22:83:30 | Hello! | try.ps1:83:9:83:30 | Write-Output |  |
+| try.ps1:83:9:83:30 | call to Write-Output | try.ps1:89:5:89:13 | return ... |  |
+| try.ps1:83:22:83:30 | Hello! | try.ps1:83:9:83:30 | call to Write-Output |  |
 | try.ps1:89:5:89:13 | return ... | try.ps1:89:12:89:13 | 2 |  |
 | try.ps1:89:12:89:13 | 2 | try.ps1:81:40:90:2 | exit {...} (normal) |  |
 | try.ps1:89:12:89:13 | 2 | try.ps1:89:12:89:13 | 2 |  |
@@ -656,8 +678,8 @@
 | try.ps1:93:5:102:13 | {...} | try.ps1:93:5:101:6 | try {...} |  |
 | try.ps1:93:9:95:6 | {...} | try.ps1:94:9:94:21 | Write-Output |  |
 | try.ps1:94:9:94:21 | Write-Output | try.ps1:94:22:94:30 | Hello! |  |
-| try.ps1:94:9:94:30 | Write-Output | try.ps1:102:5:102:13 | return ... |  |
-| try.ps1:94:22:94:30 | Hello! | try.ps1:94:9:94:30 | Write-Output |  |
+| try.ps1:94:9:94:30 | call to Write-Output | try.ps1:102:5:102:13 | return ... |  |
+| try.ps1:94:22:94:30 | Hello! | try.ps1:94:9:94:30 | call to Write-Output |  |
 | try.ps1:102:5:102:13 | return ... | try.ps1:102:12:102:13 | 3 |  |
 | try.ps1:102:12:102:13 | 3 | try.ps1:92:42:103:2 | exit {...} (normal) |  |
 | try.ps1:102:12:102:13 | 3 | try.ps1:102:12:102:13 | 3 |  |
@@ -669,12 +691,12 @@
 | try.ps1:106:5:113:13 | {...} | try.ps1:106:5:112:6 | try {...} |  |
 | try.ps1:106:9:108:6 | {...} | try.ps1:107:9:107:21 | Write-Output |  |
 | try.ps1:107:9:107:21 | Write-Output | try.ps1:107:22:107:30 | Hello! |  |
-| try.ps1:107:9:107:30 | Write-Output | try.ps1:110:15:112:6 | {...} |  |
-| try.ps1:107:22:107:30 | Hello! | try.ps1:107:9:107:30 | Write-Output |  |
+| try.ps1:107:9:107:30 | call to Write-Output | try.ps1:110:15:112:6 | {...} |  |
+| try.ps1:107:22:107:30 | Hello! | try.ps1:107:9:107:30 | call to Write-Output |  |
 | try.ps1:110:15:112:6 | {...} | try.ps1:111:9:111:21 | Write-Output |  |
 | try.ps1:111:9:111:21 | Write-Output | try.ps1:111:22:111:32 | Finally! |  |
-| try.ps1:111:9:111:32 | Write-Output | try.ps1:113:5:113:13 | return ... |  |
-| try.ps1:111:22:111:32 | Finally! | try.ps1:111:9:111:32 | Write-Output |  |
+| try.ps1:111:9:111:32 | call to Write-Output | try.ps1:113:5:113:13 | return ... |  |
+| try.ps1:111:22:111:32 | Finally! | try.ps1:111:9:111:32 | call to Write-Output |  |
 | try.ps1:113:5:113:13 | return ... | try.ps1:113:12:113:13 | 1 |  |
 | try.ps1:113:12:113:13 | 1 | try.ps1:105:33:114:2 | exit {...} (normal) |  |
 | try.ps1:113:12:113:13 | 1 | try.ps1:113:12:113:13 | 1 |  |
@@ -686,12 +708,12 @@
 | try.ps1:117:5:122:13 | {...} | try.ps1:117:5:121:6 | try {...} |  |
 | try.ps1:117:9:119:6 | {...} | try.ps1:118:9:118:21 | Write-Output |  |
 | try.ps1:118:9:118:21 | Write-Output | try.ps1:118:22:118:30 | Hello! |  |
-| try.ps1:118:9:118:30 | Write-Output | try.ps1:119:15:121:6 | {...} |  |
-| try.ps1:118:22:118:30 | Hello! | try.ps1:118:9:118:30 | Write-Output |  |
+| try.ps1:118:9:118:30 | call to Write-Output | try.ps1:119:15:121:6 | {...} |  |
+| try.ps1:118:22:118:30 | Hello! | try.ps1:118:9:118:30 | call to Write-Output |  |
 | try.ps1:119:15:121:6 | {...} | try.ps1:120:9:120:21 | Write-Output |  |
 | try.ps1:120:9:120:21 | Write-Output | try.ps1:120:22:120:32 | Finally! |  |
-| try.ps1:120:9:120:32 | Write-Output | try.ps1:122:5:122:13 | return ... |  |
-| try.ps1:120:22:120:32 | Finally! | try.ps1:120:9:120:32 | Write-Output |  |
+| try.ps1:120:9:120:32 | call to Write-Output | try.ps1:122:5:122:13 | return ... |  |
+| try.ps1:120:22:120:32 | Finally! | try.ps1:120:9:120:32 | call to Write-Output |  |
 | try.ps1:122:5:122:13 | return ... | try.ps1:122:12:122:13 | 1 |  |
 | try.ps1:122:12:122:13 | 1 | try.ps1:116:27:123:2 | exit {...} (normal) |  |
 | try.ps1:122:12:122:13 | 1 | try.ps1:122:12:122:13 | 1 |  |
@@ -703,12 +725,12 @@
 | try.ps1:126:5:133:13 | {...} | try.ps1:126:5:132:6 | try {...} |  |
 | try.ps1:126:9:128:6 | {...} | try.ps1:127:9:127:21 | Write-Output |  |
 | try.ps1:127:9:127:21 | Write-Output | try.ps1:127:22:127:30 | Hello! |  |
-| try.ps1:127:9:127:30 | Write-Output | try.ps1:130:15:132:6 | {...} |  |
-| try.ps1:127:22:127:30 | Hello! | try.ps1:127:9:127:30 | Write-Output |  |
+| try.ps1:127:9:127:30 | call to Write-Output | try.ps1:130:15:132:6 | {...} |  |
+| try.ps1:127:22:127:30 | Hello! | try.ps1:127:9:127:30 | call to Write-Output |  |
 | try.ps1:130:15:132:6 | {...} | try.ps1:131:9:131:21 | Write-Output |  |
 | try.ps1:131:9:131:21 | Write-Output | try.ps1:131:22:131:32 | Finally! |  |
-| try.ps1:131:9:131:32 | Write-Output | try.ps1:133:5:133:13 | return ... |  |
-| try.ps1:131:22:131:32 | Finally! | try.ps1:131:9:131:32 | Write-Output |  |
+| try.ps1:131:9:131:32 | call to Write-Output | try.ps1:133:5:133:13 | return ... |  |
+| try.ps1:131:22:131:32 | Finally! | try.ps1:131:9:131:32 | call to Write-Output |  |
 | try.ps1:133:5:133:13 | return ... | try.ps1:133:12:133:13 | 1 |  |
 | try.ps1:133:12:133:13 | 1 | try.ps1:125:44:134:2 | exit {...} (normal) |  |
 | try.ps1:133:12:133:13 | 1 | try.ps1:133:12:133:13 | 1 |  |
@@ -722,8 +744,8 @@
 | try.ps1:138:9:142:10 | try {...} | try.ps1:138:13:140:10 | {...} |  |
 | try.ps1:138:13:140:10 | {...} | try.ps1:139:13:139:25 | Write-Output |  |
 | try.ps1:139:13:139:25 | Write-Output | try.ps1:139:26:139:34 | Hello! |  |
-| try.ps1:139:13:139:34 | Write-Output | try.ps1:146:5:146:13 | return ... |  |
-| try.ps1:139:26:139:34 | Hello! | try.ps1:139:13:139:34 | Write-Output |  |
+| try.ps1:139:13:139:34 | call to Write-Output | try.ps1:146:5:146:13 | return ... |  |
+| try.ps1:139:26:139:34 | Hello! | try.ps1:139:13:139:34 | call to Write-Output |  |
 | try.ps1:146:5:146:13 | return ... | try.ps1:146:12:146:13 | 1 |  |
 | try.ps1:146:12:146:13 | 1 | try.ps1:136:40:147:2 | exit {...} (normal) |  |
 | try.ps1:146:12:146:13 | 1 | try.ps1:146:12:146:13 | 1 |  |
@@ -737,12 +759,12 @@
 | try.ps1:151:9:157:10 | try {...} | try.ps1:151:13:153:10 | {...} |  |
 | try.ps1:151:13:153:10 | {...} | try.ps1:152:13:152:25 | Write-Output |  |
 | try.ps1:152:13:152:25 | Write-Output | try.ps1:152:26:152:34 | Hello! |  |
-| try.ps1:152:13:152:34 | Write-Output | try.ps1:155:19:157:10 | {...} |  |
-| try.ps1:152:26:152:34 | Hello! | try.ps1:152:13:152:34 | Write-Output |  |
+| try.ps1:152:13:152:34 | call to Write-Output | try.ps1:155:19:157:10 | {...} |  |
+| try.ps1:152:26:152:34 | Hello! | try.ps1:152:13:152:34 | call to Write-Output |  |
 | try.ps1:155:19:157:10 | {...} | try.ps1:156:13:156:25 | Write-Output |  |
 | try.ps1:156:13:156:25 | Write-Output | try.ps1:156:26:156:36 | Finally! |  |
-| try.ps1:156:13:156:36 | Write-Output | try.ps1:161:5:161:13 | return ... |  |
-| try.ps1:156:26:156:36 | Finally! | try.ps1:156:13:156:36 | Write-Output |  |
+| try.ps1:156:13:156:36 | call to Write-Output | try.ps1:161:5:161:13 | return ... |  |
+| try.ps1:156:26:156:36 | Finally! | try.ps1:156:13:156:36 | call to Write-Output |  |
 | try.ps1:161:5:161:13 | return ... | try.ps1:161:12:161:13 | 1 |  |
 | try.ps1:161:12:161:13 | 1 | try.ps1:149:40:162:2 | exit {...} (normal) |  |
 | try.ps1:161:12:161:13 | 1 | try.ps1:161:12:161:13 | 1 |  |
@@ -756,12 +778,12 @@
 | try.ps1:166:9:170:10 | try {...} | try.ps1:166:13:168:10 | {...} |  |
 | try.ps1:166:13:168:10 | {...} | try.ps1:167:13:167:25 | Write-Output |  |
 | try.ps1:167:13:167:25 | Write-Output | try.ps1:167:26:167:34 | Hello! |  |
-| try.ps1:167:13:167:34 | Write-Output | try.ps1:173:15:175:6 | {...} |  |
-| try.ps1:167:26:167:34 | Hello! | try.ps1:167:13:167:34 | Write-Output |  |
+| try.ps1:167:13:167:34 | call to Write-Output | try.ps1:173:15:175:6 | {...} |  |
+| try.ps1:167:26:167:34 | Hello! | try.ps1:167:13:167:34 | call to Write-Output |  |
 | try.ps1:173:15:175:6 | {...} | try.ps1:174:9:174:21 | Write-Output |  |
 | try.ps1:174:9:174:21 | Write-Output | try.ps1:174:22:174:32 | Finally! |  |
-| try.ps1:174:9:174:32 | Write-Output | try.ps1:176:5:176:13 | return ... |  |
-| try.ps1:174:22:174:32 | Finally! | try.ps1:174:9:174:32 | Write-Output |  |
+| try.ps1:174:9:174:32 | call to Write-Output | try.ps1:176:5:176:13 | return ... |  |
+| try.ps1:174:22:174:32 | Finally! | try.ps1:174:9:174:32 | call to Write-Output |  |
 | try.ps1:176:5:176:13 | return ... | try.ps1:176:12:176:13 | 1 |  |
 | try.ps1:176:12:176:13 | 1 | try.ps1:164:40:177:2 | exit {...} (normal) |  |
 | try.ps1:176:12:176:13 | 1 | try.ps1:176:12:176:13 | 1 |  |
@@ -775,16 +797,16 @@
 | try.ps1:181:9:187:10 | try {...} | try.ps1:181:13:183:10 | {...} |  |
 | try.ps1:181:13:183:10 | {...} | try.ps1:182:13:182:25 | Write-Output |  |
 | try.ps1:182:13:182:25 | Write-Output | try.ps1:182:26:182:34 | Hello! |  |
-| try.ps1:182:13:182:34 | Write-Output | try.ps1:185:19:187:10 | {...} |  |
-| try.ps1:182:26:182:34 | Hello! | try.ps1:182:13:182:34 | Write-Output |  |
+| try.ps1:182:13:182:34 | call to Write-Output | try.ps1:185:19:187:10 | {...} |  |
+| try.ps1:182:26:182:34 | Hello! | try.ps1:182:13:182:34 | call to Write-Output |  |
 | try.ps1:185:19:187:10 | {...} | try.ps1:186:13:186:25 | Write-Output |  |
 | try.ps1:186:13:186:25 | Write-Output | try.ps1:186:26:186:36 | Finally! |  |
-| try.ps1:186:13:186:36 | Write-Output | try.ps1:190:15:192:6 | {...} |  |
-| try.ps1:186:26:186:36 | Finally! | try.ps1:186:13:186:36 | Write-Output |  |
+| try.ps1:186:13:186:36 | call to Write-Output | try.ps1:190:15:192:6 | {...} |  |
+| try.ps1:186:26:186:36 | Finally! | try.ps1:186:13:186:36 | call to Write-Output |  |
 | try.ps1:190:15:192:6 | {...} | try.ps1:191:9:191:21 | Write-Output |  |
 | try.ps1:191:9:191:21 | Write-Output | try.ps1:191:22:191:32 | Finally! |  |
-| try.ps1:191:9:191:32 | Write-Output | try.ps1:193:5:193:13 | return ... |  |
-| try.ps1:191:22:191:32 | Finally! | try.ps1:191:9:191:32 | Write-Output |  |
+| try.ps1:191:9:191:32 | call to Write-Output | try.ps1:193:5:193:13 | return ... |  |
+| try.ps1:191:22:191:32 | Finally! | try.ps1:191:9:191:32 | call to Write-Output |  |
 | try.ps1:193:5:193:13 | return ... | try.ps1:193:12:193:13 | 1 |  |
 | try.ps1:193:12:193:13 | 1 | try.ps1:179:46:194:2 | exit {...} (normal) |  |
 | try.ps1:193:12:193:13 | 1 | try.ps1:193:12:193:13 | 1 |  |
diff --git a/powershell/ql/test/library-tests/dataflow/fields/test.expected b/powershell/ql/test/library-tests/dataflow/fields/test.expected
index 68473de8e3f..40cc3128e6a 100644
--- a/powershell/ql/test/library-tests/dataflow/fields/test.expected
+++ b/powershell/ql/test/library-tests/dataflow/fields/test.expected
@@ -1,32 +1,32 @@
 models
 edges
 | test.ps1:1:1:1:3 | [post] a [f] | test.ps1:2:6:2:8 | a [f] | provenance |  |
-| test.ps1:1:8:1:18 | Source | test.ps1:1:1:1:3 | [post] a [f] | provenance |  |
+| test.ps1:1:8:1:18 | call to Source | test.ps1:1:1:1:3 | [post] a [f] | provenance |  |
 | test.ps1:2:6:2:8 | a [f] | test.ps1:2:6:2:10 | f | provenance |  |
 | test.ps1:8:1:8:6 | [post] arr1 [element 3] | test.ps1:9:6:9:11 | arr1 [element 3] | provenance |  |
 | test.ps1:8:1:8:6 | [post] arr1 [element 3] | test.ps1:9:6:9:11 | arr1 [element 3] | provenance |  |
-| test.ps1:8:12:8:22 | Source | test.ps1:8:1:8:6 | [post] arr1 [element 3] | provenance |  |
-| test.ps1:8:12:8:22 | Source | test.ps1:8:1:8:6 | [post] arr1 [element 3] | provenance |  |
+| test.ps1:8:12:8:22 | call to Source | test.ps1:8:1:8:6 | [post] arr1 [element 3] | provenance |  |
+| test.ps1:8:12:8:22 | call to Source | test.ps1:8:1:8:6 | [post] arr1 [element 3] | provenance |  |
 | test.ps1:9:6:9:11 | arr1 [element 3] | test.ps1:9:6:9:14 | ...[...] | provenance |  |
 | test.ps1:9:6:9:11 | arr1 [element 3] | test.ps1:9:6:9:14 | ...[...] | provenance |  |
 | test.ps1:12:1:12:6 | [post] arr2 [element] | test.ps1:13:6:13:11 | arr2 [element] | provenance |  |
-| test.ps1:12:19:12:29 | Source | test.ps1:12:1:12:6 | [post] arr2 [element] | provenance |  |
+| test.ps1:12:19:12:29 | call to Source | test.ps1:12:1:12:6 | [post] arr2 [element] | provenance |  |
 | test.ps1:13:6:13:11 | arr2 [element] | test.ps1:13:6:13:14 | ...[...] | provenance |  |
 | test.ps1:15:1:15:6 | [post] arr3 [element 3] | test.ps1:16:6:16:11 | arr3 [element 3] | provenance |  |
 | test.ps1:15:1:15:6 | [post] arr3 [element 3] | test.ps1:16:6:16:11 | arr3 [element 3] | provenance |  |
-| test.ps1:15:12:15:22 | Source | test.ps1:15:1:15:6 | [post] arr3 [element 3] | provenance |  |
-| test.ps1:15:12:15:22 | Source | test.ps1:15:1:15:6 | [post] arr3 [element 3] | provenance |  |
+| test.ps1:15:12:15:22 | call to Source | test.ps1:15:1:15:6 | [post] arr3 [element 3] | provenance |  |
+| test.ps1:15:12:15:22 | call to Source | test.ps1:15:1:15:6 | [post] arr3 [element 3] | provenance |  |
 | test.ps1:16:6:16:11 | arr3 [element 3] | test.ps1:16:6:16:21 | ...[...] | provenance |  |
 | test.ps1:16:6:16:11 | arr3 [element 3] | test.ps1:16:6:16:21 | ...[...] | provenance |  |
 | test.ps1:18:1:18:6 | [post] arr4 [element] | test.ps1:19:6:19:11 | arr4 [element] | provenance |  |
-| test.ps1:18:20:18:30 | Source | test.ps1:18:1:18:6 | [post] arr4 [element] | provenance |  |
+| test.ps1:18:20:18:30 | call to Source | test.ps1:18:1:18:6 | [post] arr4 [element] | provenance |  |
 | test.ps1:19:6:19:11 | arr4 [element] | test.ps1:19:6:19:22 | ...[...] | provenance |  |
 | test.ps1:21:1:21:6 | [post] arr5 [element, element 1] | test.ps1:22:6:22:11 | arr5 [element, element 1] | provenance |  |
 | test.ps1:21:1:21:6 | [post] arr5 [element, element 1] | test.ps1:22:6:22:11 | arr5 [element, element 1] | provenance |  |
 | test.ps1:21:1:21:17 | [post] ...[...] [element 1] | test.ps1:21:1:21:6 | [post] arr5 [element, element 1] | provenance |  |
 | test.ps1:21:1:21:17 | [post] ...[...] [element 1] | test.ps1:21:1:21:6 | [post] arr5 [element, element 1] | provenance |  |
-| test.ps1:21:23:21:33 | Source | test.ps1:21:1:21:17 | [post] ...[...] [element 1] | provenance |  |
-| test.ps1:21:23:21:33 | Source | test.ps1:21:1:21:17 | [post] ...[...] [element 1] | provenance |  |
+| test.ps1:21:23:21:33 | call to Source | test.ps1:21:1:21:17 | [post] ...[...] [element 1] | provenance |  |
+| test.ps1:21:23:21:33 | call to Source | test.ps1:21:1:21:17 | [post] ...[...] [element 1] | provenance |  |
 | test.ps1:22:6:22:11 | arr5 [element, element 1] | test.ps1:22:6:22:22 | ...[...] [element 1] | provenance |  |
 | test.ps1:22:6:22:11 | arr5 [element, element 1] | test.ps1:22:6:22:22 | ...[...] [element 1] | provenance |  |
 | test.ps1:22:6:22:22 | ...[...] [element 1] | test.ps1:22:6:22:25 | ...[...] | provenance |  |
@@ -35,25 +35,25 @@ edges
 | test.ps1:25:1:25:6 | [post] arr6 [element 1, element] | test.ps1:26:6:26:11 | arr6 [element 1, element] | provenance |  |
 | test.ps1:25:1:25:9 | [post] ...[...] [element] | test.ps1:25:1:25:6 | [post] arr6 [element 1, element] | provenance |  |
 | test.ps1:25:1:25:9 | [post] ...[...] [element] | test.ps1:25:1:25:6 | [post] arr6 [element 1, element] | provenance |  |
-| test.ps1:25:23:25:33 | Source | test.ps1:25:1:25:9 | [post] ...[...] [element] | provenance |  |
+| test.ps1:25:23:25:33 | call to Source | test.ps1:25:1:25:9 | [post] ...[...] [element] | provenance |  |
 | test.ps1:26:6:26:11 | arr6 [element 1, element] | test.ps1:26:6:26:14 | ...[...] [element] | provenance |  |
 | test.ps1:26:6:26:11 | arr6 [element 1, element] | test.ps1:26:6:26:14 | ...[...] [element] | provenance |  |
 | test.ps1:26:6:26:14 | ...[...] [element] | test.ps1:26:6:26:25 | ...[...] | provenance |  |
 | test.ps1:29:1:29:6 | [post] arr7 [element, element] | test.ps1:30:6:30:11 | arr7 [element, element] | provenance |  |
 | test.ps1:29:1:29:6 | [post] arr7 [element, element] | test.ps1:31:6:31:11 | arr7 [element, element] | provenance |  |
 | test.ps1:29:1:29:17 | [post] ...[...] [element] | test.ps1:29:1:29:6 | [post] arr7 [element, element] | provenance |  |
-| test.ps1:29:31:29:41 | Source | test.ps1:29:1:29:17 | [post] ...[...] [element] | provenance |  |
+| test.ps1:29:31:29:41 | call to Source | test.ps1:29:1:29:17 | [post] ...[...] [element] | provenance |  |
 | test.ps1:30:6:30:11 | arr7 [element, element] | test.ps1:30:6:30:14 | ...[...] [element] | provenance |  |
 | test.ps1:30:6:30:14 | ...[...] [element] | test.ps1:30:6:30:17 | ...[...] | provenance |  |
 | test.ps1:31:6:31:11 | arr7 [element, element] | test.ps1:31:6:31:22 | ...[...] [element] | provenance |  |
 | test.ps1:31:6:31:22 | ...[...] [element] | test.ps1:31:6:31:33 | ...[...] | provenance |  |
-| test.ps1:33:6:33:17 | Source | test.ps1:35:15:35:17 | x | provenance |  |
+| test.ps1:33:6:33:17 | call to Source | test.ps1:35:15:35:17 | x | provenance |  |
 | test.ps1:35:9:35:17 | ...,... [element 2] | test.ps1:38:6:38:11 | arr8 [element 2] | provenance |  |
 | test.ps1:35:9:35:17 | ...,... [element 2] | test.ps1:39:6:39:11 | arr8 [element 2] | provenance |  |
 | test.ps1:35:15:35:17 | x | test.ps1:35:9:35:17 | ...,... [element 2] | provenance |  |
 | test.ps1:38:6:38:11 | arr8 [element 2] | test.ps1:38:6:38:14 | ...[...] | provenance |  |
 | test.ps1:39:6:39:11 | arr8 [element 2] | test.ps1:39:6:39:21 | ...[...] | provenance |  |
-| test.ps1:41:6:41:17 | Source | test.ps1:43:17:43:19 | y | provenance |  |
+| test.ps1:41:6:41:17 | call to Source | test.ps1:43:17:43:19 | y | provenance |  |
 | test.ps1:43:11:43:19 | ...,... [element 2] | test.ps1:46:6:46:11 | arr9 [element 2] | provenance |  |
 | test.ps1:43:11:43:19 | ...,... [element 2] | test.ps1:47:6:47:11 | arr9 [element 2] | provenance |  |
 | test.ps1:43:17:43:19 | y | test.ps1:43:11:43:19 | ...,... [element 2] | provenance |  |
@@ -62,60 +62,60 @@ edges
 | test.ps1:52:22:54:6 | this [field] | test.ps1:53:14:53:19 | this [field] | provenance |  |
 | test.ps1:53:14:53:19 | this [field] | test.ps1:53:14:53:25 | field | provenance |  |
 | test.ps1:59:1:59:9 | [post] myClass [field] | test.ps1:61:1:61:9 | myClass [field] | provenance |  |
-| test.ps1:59:18:59:29 | Source | test.ps1:59:1:59:9 | [post] myClass [field] | provenance |  |
+| test.ps1:59:18:59:29 | call to Source | test.ps1:59:1:59:9 | [post] myClass [field] | provenance |  |
 | test.ps1:61:1:61:9 | myClass [field] | test.ps1:52:22:54:6 | this [field] | provenance |  |
-| test.ps1:64:10:64:21 | Source | test.ps1:67:5:67:7 | x | provenance |  |
-| test.ps1:65:10:65:21 | Source | test.ps1:68:5:68:7 | y | provenance |  |
-| test.ps1:66:10:66:21 | Source | test.ps1:68:9:68:11 | z | provenance |  |
-| test.ps1:67:5:67:7 | x | test.ps1:71:6:71:13 | produce [element] | provenance |  |
+| test.ps1:64:10:64:21 | call to Source | test.ps1:67:5:67:7 | x | provenance |  |
+| test.ps1:65:10:65:21 | call to Source | test.ps1:68:5:68:7 | y | provenance |  |
+| test.ps1:66:10:66:21 | call to Source | test.ps1:68:9:68:11 | z | provenance |  |
+| test.ps1:67:5:67:7 | x | test.ps1:71:6:71:13 | call to produce [element] | provenance |  |
 | test.ps1:68:5:68:7 | y | test.ps1:68:5:68:11 | ...,... [element 0] | provenance |  |
-| test.ps1:68:5:68:11 | ...,... [element 0] | test.ps1:71:6:71:13 | produce [element] | provenance |  |
-| test.ps1:68:5:68:11 | ...,... [element 1] | test.ps1:71:6:71:13 | produce [element] | provenance |  |
+| test.ps1:68:5:68:11 | ...,... [element 0] | test.ps1:71:6:71:13 | call to produce [element] | provenance |  |
+| test.ps1:68:5:68:11 | ...,... [element 1] | test.ps1:71:6:71:13 | call to produce [element] | provenance |  |
 | test.ps1:68:9:68:11 | z | test.ps1:68:5:68:11 | ...,... [element 1] | provenance |  |
-| test.ps1:71:6:71:13 | produce [element] | test.ps1:72:6:72:8 | x [element] | provenance |  |
-| test.ps1:71:6:71:13 | produce [element] | test.ps1:73:6:73:8 | x [element] | provenance |  |
-| test.ps1:71:6:71:13 | produce [element] | test.ps1:74:6:74:8 | x [element] | provenance |  |
+| test.ps1:71:6:71:13 | call to produce [element] | test.ps1:72:6:72:8 | x [element] | provenance |  |
+| test.ps1:71:6:71:13 | call to produce [element] | test.ps1:73:6:73:8 | x [element] | provenance |  |
+| test.ps1:71:6:71:13 | call to produce [element] | test.ps1:74:6:74:8 | x [element] | provenance |  |
 | test.ps1:72:6:72:8 | x [element] | test.ps1:72:6:72:11 | ...[...] | provenance |  |
 | test.ps1:73:6:73:8 | x [element] | test.ps1:73:6:73:11 | ...[...] | provenance |  |
 | test.ps1:74:6:74:8 | x [element] | test.ps1:74:6:74:11 | ...[...] | provenance |  |
 | test.ps1:76:9:79:2 | ${...} [element a] | test.ps1:81:6:81:11 | hash [element a] | provenance |  |
 | test.ps1:76:9:79:2 | ${...} [element a] | test.ps1:85:6:85:11 | hash [element a] | provenance |  |
-| test.ps1:77:7:77:18 | Source | test.ps1:76:9:79:2 | ${...} [element a] | provenance |  |
+| test.ps1:77:7:77:18 | call to Source | test.ps1:76:9:79:2 | ${...} [element a] | provenance |  |
 | test.ps1:81:6:81:11 | hash [element a] | test.ps1:81:6:81:16 | ...[...] | provenance |  |
 | test.ps1:85:6:85:11 | hash [element a] | test.ps1:85:6:85:16 | ...[...] | provenance |  |
 | test.ps1:86:1:86:6 | [post] hash [b] | test.ps1:87:6:87:11 | hash [b] | provenance |  |
-| test.ps1:86:11:86:22 | Source | test.ps1:86:1:86:6 | [post] hash [b] | provenance |  |
+| test.ps1:86:11:86:22 | call to Source | test.ps1:86:1:86:6 | [post] hash [b] | provenance |  |
 | test.ps1:87:6:87:11 | hash [b] | test.ps1:87:6:87:13 | b | provenance |  |
 nodes
 | test.ps1:1:1:1:3 | [post] a [f] | semmle.label | [post] a [f] |
-| test.ps1:1:8:1:18 | Source | semmle.label | Source |
+| test.ps1:1:8:1:18 | call to Source | semmle.label | call to Source |
 | test.ps1:2:6:2:8 | a [f] | semmle.label | a [f] |
 | test.ps1:2:6:2:10 | f | semmle.label | f |
 | test.ps1:8:1:8:6 | [post] arr1 [element 3] | semmle.label | [post] arr1 [element 3] |
 | test.ps1:8:1:8:6 | [post] arr1 [element 3] | semmle.label | [post] arr1 [element 3] |
-| test.ps1:8:12:8:22 | Source | semmle.label | Source |
+| test.ps1:8:12:8:22 | call to Source | semmle.label | call to Source |
 | test.ps1:9:6:9:11 | arr1 [element 3] | semmle.label | arr1 [element 3] |
 | test.ps1:9:6:9:11 | arr1 [element 3] | semmle.label | arr1 [element 3] |
 | test.ps1:9:6:9:14 | ...[...] | semmle.label | ...[...] |
 | test.ps1:12:1:12:6 | [post] arr2 [element] | semmle.label | [post] arr2 [element] |
-| test.ps1:12:19:12:29 | Source | semmle.label | Source |
+| test.ps1:12:19:12:29 | call to Source | semmle.label | call to Source |
 | test.ps1:13:6:13:11 | arr2 [element] | semmle.label | arr2 [element] |
 | test.ps1:13:6:13:14 | ...[...] | semmle.label | ...[...] |
 | test.ps1:15:1:15:6 | [post] arr3 [element 3] | semmle.label | [post] arr3 [element 3] |
 | test.ps1:15:1:15:6 | [post] arr3 [element 3] | semmle.label | [post] arr3 [element 3] |
-| test.ps1:15:12:15:22 | Source | semmle.label | Source |
+| test.ps1:15:12:15:22 | call to Source | semmle.label | call to Source |
 | test.ps1:16:6:16:11 | arr3 [element 3] | semmle.label | arr3 [element 3] |
 | test.ps1:16:6:16:11 | arr3 [element 3] | semmle.label | arr3 [element 3] |
 | test.ps1:16:6:16:21 | ...[...] | semmle.label | ...[...] |
 | test.ps1:18:1:18:6 | [post] arr4 [element] | semmle.label | [post] arr4 [element] |
-| test.ps1:18:20:18:30 | Source | semmle.label | Source |
+| test.ps1:18:20:18:30 | call to Source | semmle.label | call to Source |
 | test.ps1:19:6:19:11 | arr4 [element] | semmle.label | arr4 [element] |
 | test.ps1:19:6:19:22 | ...[...] | semmle.label | ...[...] |
 | test.ps1:21:1:21:6 | [post] arr5 [element, element 1] | semmle.label | [post] arr5 [element, element 1] |
 | test.ps1:21:1:21:6 | [post] arr5 [element, element 1] | semmle.label | [post] arr5 [element, element 1] |
 | test.ps1:21:1:21:17 | [post] ...[...] [element 1] | semmle.label | [post] ...[...] [element 1] |
 | test.ps1:21:1:21:17 | [post] ...[...] [element 1] | semmle.label | [post] ...[...] [element 1] |
-| test.ps1:21:23:21:33 | Source | semmle.label | Source |
+| test.ps1:21:23:21:33 | call to Source | semmle.label | call to Source |
 | test.ps1:22:6:22:11 | arr5 [element, element 1] | semmle.label | arr5 [element, element 1] |
 | test.ps1:22:6:22:11 | arr5 [element, element 1] | semmle.label | arr5 [element, element 1] |
 | test.ps1:22:6:22:22 | ...[...] [element 1] | semmle.label | ...[...] [element 1] |
@@ -124,28 +124,28 @@ nodes
 | test.ps1:25:1:25:6 | [post] arr6 [element 1, element] | semmle.label | [post] arr6 [element 1, element] |
 | test.ps1:25:1:25:6 | [post] arr6 [element 1, element] | semmle.label | [post] arr6 [element 1, element] |
 | test.ps1:25:1:25:9 | [post] ...[...] [element] | semmle.label | [post] ...[...] [element] |
-| test.ps1:25:23:25:33 | Source | semmle.label | Source |
+| test.ps1:25:23:25:33 | call to Source | semmle.label | call to Source |
 | test.ps1:26:6:26:11 | arr6 [element 1, element] | semmle.label | arr6 [element 1, element] |
 | test.ps1:26:6:26:11 | arr6 [element 1, element] | semmle.label | arr6 [element 1, element] |
 | test.ps1:26:6:26:14 | ...[...] [element] | semmle.label | ...[...] [element] |
 | test.ps1:26:6:26:25 | ...[...] | semmle.label | ...[...] |
 | test.ps1:29:1:29:6 | [post] arr7 [element, element] | semmle.label | [post] arr7 [element, element] |
 | test.ps1:29:1:29:17 | [post] ...[...] [element] | semmle.label | [post] ...[...] [element] |
-| test.ps1:29:31:29:41 | Source | semmle.label | Source |
+| test.ps1:29:31:29:41 | call to Source | semmle.label | call to Source |
 | test.ps1:30:6:30:11 | arr7 [element, element] | semmle.label | arr7 [element, element] |
 | test.ps1:30:6:30:14 | ...[...] [element] | semmle.label | ...[...] [element] |
 | test.ps1:30:6:30:17 | ...[...] | semmle.label | ...[...] |
 | test.ps1:31:6:31:11 | arr7 [element, element] | semmle.label | arr7 [element, element] |
 | test.ps1:31:6:31:22 | ...[...] [element] | semmle.label | ...[...] [element] |
 | test.ps1:31:6:31:33 | ...[...] | semmle.label | ...[...] |
-| test.ps1:33:6:33:17 | Source | semmle.label | Source |
+| test.ps1:33:6:33:17 | call to Source | semmle.label | call to Source |
 | test.ps1:35:9:35:17 | ...,... [element 2] | semmle.label | ...,... [element 2] |
 | test.ps1:35:15:35:17 | x | semmle.label | x |
 | test.ps1:38:6:38:11 | arr8 [element 2] | semmle.label | arr8 [element 2] |
 | test.ps1:38:6:38:14 | ...[...] | semmle.label | ...[...] |
 | test.ps1:39:6:39:11 | arr8 [element 2] | semmle.label | arr8 [element 2] |
 | test.ps1:39:6:39:21 | ...[...] | semmle.label | ...[...] |
-| test.ps1:41:6:41:17 | Source | semmle.label | Source |
+| test.ps1:41:6:41:17 | call to Source | semmle.label | call to Source |
 | test.ps1:43:11:43:19 | ...,... [element 2] | semmle.label | ...,... [element 2] |
 | test.ps1:43:17:43:19 | y | semmle.label | y |
 | test.ps1:46:6:46:11 | arr9 [element 2] | semmle.label | arr9 [element 2] |
@@ -156,17 +156,17 @@ nodes
 | test.ps1:53:14:53:19 | this [field] | semmle.label | this [field] |
 | test.ps1:53:14:53:25 | field | semmle.label | field |
 | test.ps1:59:1:59:9 | [post] myClass [field] | semmle.label | [post] myClass [field] |
-| test.ps1:59:18:59:29 | Source | semmle.label | Source |
+| test.ps1:59:18:59:29 | call to Source | semmle.label | call to Source |
 | test.ps1:61:1:61:9 | myClass [field] | semmle.label | myClass [field] |
-| test.ps1:64:10:64:21 | Source | semmle.label | Source |
-| test.ps1:65:10:65:21 | Source | semmle.label | Source |
-| test.ps1:66:10:66:21 | Source | semmle.label | Source |
+| test.ps1:64:10:64:21 | call to Source | semmle.label | call to Source |
+| test.ps1:65:10:65:21 | call to Source | semmle.label | call to Source |
+| test.ps1:66:10:66:21 | call to Source | semmle.label | call to Source |
 | test.ps1:67:5:67:7 | x | semmle.label | x |
 | test.ps1:68:5:68:7 | y | semmle.label | y |
 | test.ps1:68:5:68:11 | ...,... [element 0] | semmle.label | ...,... [element 0] |
 | test.ps1:68:5:68:11 | ...,... [element 1] | semmle.label | ...,... [element 1] |
 | test.ps1:68:9:68:11 | z | semmle.label | z |
-| test.ps1:71:6:71:13 | produce [element] | semmle.label | produce [element] |
+| test.ps1:71:6:71:13 | call to produce [element] | semmle.label | call to produce [element] |
 | test.ps1:72:6:72:8 | x [element] | semmle.label | x [element] |
 | test.ps1:72:6:72:11 | ...[...] | semmle.label | ...[...] |
 | test.ps1:73:6:73:8 | x [element] | semmle.label | x [element] |
@@ -174,41 +174,41 @@ nodes
 | test.ps1:74:6:74:8 | x [element] | semmle.label | x [element] |
 | test.ps1:74:6:74:11 | ...[...] | semmle.label | ...[...] |
 | test.ps1:76:9:79:2 | ${...} [element a] | semmle.label | ${...} [element a] |
-| test.ps1:77:7:77:18 | Source | semmle.label | Source |
+| test.ps1:77:7:77:18 | call to Source | semmle.label | call to Source |
 | test.ps1:81:6:81:11 | hash [element a] | semmle.label | hash [element a] |
 | test.ps1:81:6:81:16 | ...[...] | semmle.label | ...[...] |
 | test.ps1:85:6:85:11 | hash [element a] | semmle.label | hash [element a] |
 | test.ps1:85:6:85:16 | ...[...] | semmle.label | ...[...] |
 | test.ps1:86:1:86:6 | [post] hash [b] | semmle.label | [post] hash [b] |
-| test.ps1:86:11:86:22 | Source | semmle.label | Source |
+| test.ps1:86:11:86:22 | call to Source | semmle.label | call to Source |
 | test.ps1:87:6:87:11 | hash [b] | semmle.label | hash [b] |
 | test.ps1:87:6:87:13 | b | semmle.label | b |
 subpaths
 testFailures
 #select
-| test.ps1:2:6:2:10 | f | test.ps1:1:8:1:18 | Source | test.ps1:2:6:2:10 | f | $@ | test.ps1:1:8:1:18 | Source | Source |
-| test.ps1:9:6:9:14 | ...[...] | test.ps1:8:12:8:22 | Source | test.ps1:9:6:9:14 | ...[...] | $@ | test.ps1:8:12:8:22 | Source | Source |
-| test.ps1:13:6:13:14 | ...[...] | test.ps1:12:19:12:29 | Source | test.ps1:13:6:13:14 | ...[...] | $@ | test.ps1:12:19:12:29 | Source | Source |
-| test.ps1:16:6:16:21 | ...[...] | test.ps1:15:12:15:22 | Source | test.ps1:16:6:16:21 | ...[...] | $@ | test.ps1:15:12:15:22 | Source | Source |
-| test.ps1:19:6:19:22 | ...[...] | test.ps1:18:20:18:30 | Source | test.ps1:19:6:19:22 | ...[...] | $@ | test.ps1:18:20:18:30 | Source | Source |
-| test.ps1:22:6:22:25 | ...[...] | test.ps1:21:23:21:33 | Source | test.ps1:22:6:22:25 | ...[...] | $@ | test.ps1:21:23:21:33 | Source | Source |
-| test.ps1:26:6:26:25 | ...[...] | test.ps1:25:23:25:33 | Source | test.ps1:26:6:26:25 | ...[...] | $@ | test.ps1:25:23:25:33 | Source | Source |
-| test.ps1:30:6:30:17 | ...[...] | test.ps1:29:31:29:41 | Source | test.ps1:30:6:30:17 | ...[...] | $@ | test.ps1:29:31:29:41 | Source | Source |
-| test.ps1:31:6:31:33 | ...[...] | test.ps1:29:31:29:41 | Source | test.ps1:31:6:31:33 | ...[...] | $@ | test.ps1:29:31:29:41 | Source | Source |
-| test.ps1:38:6:38:14 | ...[...] | test.ps1:33:6:33:17 | Source | test.ps1:38:6:38:14 | ...[...] | $@ | test.ps1:33:6:33:17 | Source | Source |
-| test.ps1:39:6:39:21 | ...[...] | test.ps1:33:6:33:17 | Source | test.ps1:39:6:39:21 | ...[...] | $@ | test.ps1:33:6:33:17 | Source | Source |
-| test.ps1:46:6:46:14 | ...[...] | test.ps1:41:6:41:17 | Source | test.ps1:46:6:46:14 | ...[...] | $@ | test.ps1:41:6:41:17 | Source | Source |
-| test.ps1:47:6:47:21 | ...[...] | test.ps1:41:6:41:17 | Source | test.ps1:47:6:47:21 | ...[...] | $@ | test.ps1:41:6:41:17 | Source | Source |
-| test.ps1:53:14:53:25 | field | test.ps1:59:18:59:29 | Source | test.ps1:53:14:53:25 | field | $@ | test.ps1:59:18:59:29 | Source | Source |
-| test.ps1:72:6:72:11 | ...[...] | test.ps1:64:10:64:21 | Source | test.ps1:72:6:72:11 | ...[...] | $@ | test.ps1:64:10:64:21 | Source | Source |
-| test.ps1:72:6:72:11 | ...[...] | test.ps1:65:10:65:21 | Source | test.ps1:72:6:72:11 | ...[...] | $@ | test.ps1:65:10:65:21 | Source | Source |
-| test.ps1:72:6:72:11 | ...[...] | test.ps1:66:10:66:21 | Source | test.ps1:72:6:72:11 | ...[...] | $@ | test.ps1:66:10:66:21 | Source | Source |
-| test.ps1:73:6:73:11 | ...[...] | test.ps1:64:10:64:21 | Source | test.ps1:73:6:73:11 | ...[...] | $@ | test.ps1:64:10:64:21 | Source | Source |
-| test.ps1:73:6:73:11 | ...[...] | test.ps1:65:10:65:21 | Source | test.ps1:73:6:73:11 | ...[...] | $@ | test.ps1:65:10:65:21 | Source | Source |
-| test.ps1:73:6:73:11 | ...[...] | test.ps1:66:10:66:21 | Source | test.ps1:73:6:73:11 | ...[...] | $@ | test.ps1:66:10:66:21 | Source | Source |
-| test.ps1:74:6:74:11 | ...[...] | test.ps1:64:10:64:21 | Source | test.ps1:74:6:74:11 | ...[...] | $@ | test.ps1:64:10:64:21 | Source | Source |
-| test.ps1:74:6:74:11 | ...[...] | test.ps1:65:10:65:21 | Source | test.ps1:74:6:74:11 | ...[...] | $@ | test.ps1:65:10:65:21 | Source | Source |
-| test.ps1:74:6:74:11 | ...[...] | test.ps1:66:10:66:21 | Source | test.ps1:74:6:74:11 | ...[...] | $@ | test.ps1:66:10:66:21 | Source | Source |
-| test.ps1:81:6:81:16 | ...[...] | test.ps1:77:7:77:18 | Source | test.ps1:81:6:81:16 | ...[...] | $@ | test.ps1:77:7:77:18 | Source | Source |
-| test.ps1:85:6:85:16 | ...[...] | test.ps1:77:7:77:18 | Source | test.ps1:85:6:85:16 | ...[...] | $@ | test.ps1:77:7:77:18 | Source | Source |
-| test.ps1:87:6:87:13 | b | test.ps1:86:11:86:22 | Source | test.ps1:87:6:87:13 | b | $@ | test.ps1:86:11:86:22 | Source | Source |
+| test.ps1:2:6:2:10 | f | test.ps1:1:8:1:18 | call to Source | test.ps1:2:6:2:10 | f | $@ | test.ps1:1:8:1:18 | call to Source | call to Source |
+| test.ps1:9:6:9:14 | ...[...] | test.ps1:8:12:8:22 | call to Source | test.ps1:9:6:9:14 | ...[...] | $@ | test.ps1:8:12:8:22 | call to Source | call to Source |
+| test.ps1:13:6:13:14 | ...[...] | test.ps1:12:19:12:29 | call to Source | test.ps1:13:6:13:14 | ...[...] | $@ | test.ps1:12:19:12:29 | call to Source | call to Source |
+| test.ps1:16:6:16:21 | ...[...] | test.ps1:15:12:15:22 | call to Source | test.ps1:16:6:16:21 | ...[...] | $@ | test.ps1:15:12:15:22 | call to Source | call to Source |
+| test.ps1:19:6:19:22 | ...[...] | test.ps1:18:20:18:30 | call to Source | test.ps1:19:6:19:22 | ...[...] | $@ | test.ps1:18:20:18:30 | call to Source | call to Source |
+| test.ps1:22:6:22:25 | ...[...] | test.ps1:21:23:21:33 | call to Source | test.ps1:22:6:22:25 | ...[...] | $@ | test.ps1:21:23:21:33 | call to Source | call to Source |
+| test.ps1:26:6:26:25 | ...[...] | test.ps1:25:23:25:33 | call to Source | test.ps1:26:6:26:25 | ...[...] | $@ | test.ps1:25:23:25:33 | call to Source | call to Source |
+| test.ps1:30:6:30:17 | ...[...] | test.ps1:29:31:29:41 | call to Source | test.ps1:30:6:30:17 | ...[...] | $@ | test.ps1:29:31:29:41 | call to Source | call to Source |
+| test.ps1:31:6:31:33 | ...[...] | test.ps1:29:31:29:41 | call to Source | test.ps1:31:6:31:33 | ...[...] | $@ | test.ps1:29:31:29:41 | call to Source | call to Source |
+| test.ps1:38:6:38:14 | ...[...] | test.ps1:33:6:33:17 | call to Source | test.ps1:38:6:38:14 | ...[...] | $@ | test.ps1:33:6:33:17 | call to Source | call to Source |
+| test.ps1:39:6:39:21 | ...[...] | test.ps1:33:6:33:17 | call to Source | test.ps1:39:6:39:21 | ...[...] | $@ | test.ps1:33:6:33:17 | call to Source | call to Source |
+| test.ps1:46:6:46:14 | ...[...] | test.ps1:41:6:41:17 | call to Source | test.ps1:46:6:46:14 | ...[...] | $@ | test.ps1:41:6:41:17 | call to Source | call to Source |
+| test.ps1:47:6:47:21 | ...[...] | test.ps1:41:6:41:17 | call to Source | test.ps1:47:6:47:21 | ...[...] | $@ | test.ps1:41:6:41:17 | call to Source | call to Source |
+| test.ps1:53:14:53:25 | field | test.ps1:59:18:59:29 | call to Source | test.ps1:53:14:53:25 | field | $@ | test.ps1:59:18:59:29 | call to Source | call to Source |
+| test.ps1:72:6:72:11 | ...[...] | test.ps1:64:10:64:21 | call to Source | test.ps1:72:6:72:11 | ...[...] | $@ | test.ps1:64:10:64:21 | call to Source | call to Source |
+| test.ps1:72:6:72:11 | ...[...] | test.ps1:65:10:65:21 | call to Source | test.ps1:72:6:72:11 | ...[...] | $@ | test.ps1:65:10:65:21 | call to Source | call to Source |
+| test.ps1:72:6:72:11 | ...[...] | test.ps1:66:10:66:21 | call to Source | test.ps1:72:6:72:11 | ...[...] | $@ | test.ps1:66:10:66:21 | call to Source | call to Source |
+| test.ps1:73:6:73:11 | ...[...] | test.ps1:64:10:64:21 | call to Source | test.ps1:73:6:73:11 | ...[...] | $@ | test.ps1:64:10:64:21 | call to Source | call to Source |
+| test.ps1:73:6:73:11 | ...[...] | test.ps1:65:10:65:21 | call to Source | test.ps1:73:6:73:11 | ...[...] | $@ | test.ps1:65:10:65:21 | call to Source | call to Source |
+| test.ps1:73:6:73:11 | ...[...] | test.ps1:66:10:66:21 | call to Source | test.ps1:73:6:73:11 | ...[...] | $@ | test.ps1:66:10:66:21 | call to Source | call to Source |
+| test.ps1:74:6:74:11 | ...[...] | test.ps1:64:10:64:21 | call to Source | test.ps1:74:6:74:11 | ...[...] | $@ | test.ps1:64:10:64:21 | call to Source | call to Source |
+| test.ps1:74:6:74:11 | ...[...] | test.ps1:65:10:65:21 | call to Source | test.ps1:74:6:74:11 | ...[...] | $@ | test.ps1:65:10:65:21 | call to Source | call to Source |
+| test.ps1:74:6:74:11 | ...[...] | test.ps1:66:10:66:21 | call to Source | test.ps1:74:6:74:11 | ...[...] | $@ | test.ps1:66:10:66:21 | call to Source | call to Source |
+| test.ps1:81:6:81:16 | ...[...] | test.ps1:77:7:77:18 | call to Source | test.ps1:81:6:81:16 | ...[...] | $@ | test.ps1:77:7:77:18 | call to Source | call to Source |
+| test.ps1:85:6:85:16 | ...[...] | test.ps1:77:7:77:18 | call to Source | test.ps1:85:6:85:16 | ...[...] | $@ | test.ps1:77:7:77:18 | call to Source | call to Source |
+| test.ps1:87:6:87:13 | b | test.ps1:86:11:86:22 | call to Source | test.ps1:87:6:87:13 | b | $@ | test.ps1:86:11:86:22 | call to Source | call to Source |
diff --git a/powershell/ql/test/library-tests/dataflow/local/flow.expected b/powershell/ql/test/library-tests/dataflow/local/flow.expected
index 4e8b804a227..96670d797bb 100644
--- a/powershell/ql/test/library-tests/dataflow/local/flow.expected
+++ b/powershell/ql/test/library-tests/dataflow/local/flow.expected
@@ -1,30 +1,30 @@
 | test.ps1:1:1:1:4 | a1 | test.ps1:2:6:2:9 | a1 |
-| test.ps1:1:7:1:13 | Source | test.ps1:1:1:1:4 | a1 |
-| test.ps1:1:7:1:13 | Source | test.ps1:1:1:1:13 | ...=... |
-| test.ps1:2:1:2:9 | Sink | test.ps1:2:1:2:9 | pre-return value for Sink |
-| test.ps1:2:1:2:9 | Sink | test.ps1:2:1:2:9 | pre-return value for Sink |
-| test.ps1:2:1:2:9 | implicit unwrapping of Sink | test.ps1:1:1:17:8 | return value for test.ps1 |
-| test.ps1:2:1:2:9 | pre-return value for Sink | test.ps1:2:1:2:9 | implicit unwrapping of Sink |
+| test.ps1:1:7:1:13 | call to Source | test.ps1:1:1:1:4 | a1 |
+| test.ps1:1:7:1:13 | call to Source | test.ps1:1:1:1:13 | ...=... |
+| test.ps1:2:1:2:9 | call to Sink | test.ps1:2:1:2:9 | pre-return value for call to Sink |
+| test.ps1:2:1:2:9 | call to Sink | test.ps1:2:1:2:9 | pre-return value for call to Sink |
+| test.ps1:2:1:2:9 | implicit unwrapping of call to Sink | test.ps1:1:1:21:28 | return value for test.ps1 |
+| test.ps1:2:1:2:9 | pre-return value for call to Sink | test.ps1:2:1:2:9 | implicit unwrapping of call to Sink |
 | test.ps1:4:1:4:3 | b | test.ps1:5:4:5:6 | b |
-| test.ps1:4:6:4:13 | GetBool | test.ps1:4:1:4:3 | b |
-| test.ps1:4:6:4:13 | GetBool | test.ps1:4:1:4:13 | ...=... |
+| test.ps1:4:6:4:13 | call to GetBool | test.ps1:4:1:4:3 | b |
+| test.ps1:4:6:4:13 | call to GetBool | test.ps1:4:1:4:13 | ...=... |
 | test.ps1:5:4:5:6 | b | test.ps1:10:14:10:16 | b |
 | test.ps1:6:5:6:8 | a2 | test.ps1:8:6:8:9 | a2 |
-| test.ps1:6:11:6:17 | Source | test.ps1:6:5:6:8 | a2 |
-| test.ps1:6:11:6:17 | Source | test.ps1:6:5:6:17 | ...=... |
-| test.ps1:8:1:8:9 | Sink | test.ps1:8:1:8:9 | pre-return value for Sink |
-| test.ps1:8:1:8:9 | Sink | test.ps1:8:1:8:9 | pre-return value for Sink |
-| test.ps1:8:1:8:9 | implicit unwrapping of Sink | test.ps1:1:1:17:8 | return value for test.ps1 |
-| test.ps1:8:1:8:9 | pre-return value for Sink | test.ps1:8:1:8:9 | implicit unwrapping of Sink |
+| test.ps1:6:11:6:17 | call to Source | test.ps1:6:5:6:8 | a2 |
+| test.ps1:6:11:6:17 | call to Source | test.ps1:6:5:6:17 | ...=... |
+| test.ps1:8:1:8:9 | call to Sink | test.ps1:8:1:8:9 | pre-return value for call to Sink |
+| test.ps1:8:1:8:9 | call to Sink | test.ps1:8:1:8:9 | pre-return value for call to Sink |
+| test.ps1:8:1:8:9 | implicit unwrapping of call to Sink | test.ps1:1:1:21:28 | return value for test.ps1 |
+| test.ps1:8:1:8:9 | pre-return value for call to Sink | test.ps1:8:1:8:9 | implicit unwrapping of call to Sink |
 | test.ps1:10:1:10:3 | c | test.ps1:11:6:11:8 | c |
 | test.ps1:10:6:10:16 | [...]... | test.ps1:10:1:10:3 | c |
 | test.ps1:10:6:10:16 | [...]... | test.ps1:10:1:10:16 | ...=... |
 | test.ps1:10:6:10:16 | [...]... | test.ps1:10:6:10:16 | [...]... |
 | test.ps1:10:14:10:16 | b | test.ps1:10:6:10:16 | [...]... |
-| test.ps1:11:1:11:8 | Sink | test.ps1:11:1:11:8 | pre-return value for Sink |
-| test.ps1:11:1:11:8 | Sink | test.ps1:11:1:11:8 | pre-return value for Sink |
-| test.ps1:11:1:11:8 | implicit unwrapping of Sink | test.ps1:1:1:17:8 | return value for test.ps1 |
-| test.ps1:11:1:11:8 | pre-return value for Sink | test.ps1:11:1:11:8 | implicit unwrapping of Sink |
+| test.ps1:11:1:11:8 | call to Sink | test.ps1:11:1:11:8 | pre-return value for call to Sink |
+| test.ps1:11:1:11:8 | call to Sink | test.ps1:11:1:11:8 | pre-return value for call to Sink |
+| test.ps1:11:1:11:8 | implicit unwrapping of call to Sink | test.ps1:1:1:21:28 | return value for test.ps1 |
+| test.ps1:11:1:11:8 | pre-return value for call to Sink | test.ps1:11:1:11:8 | implicit unwrapping of call to Sink |
 | test.ps1:11:6:11:8 | [post] c | test.ps1:13:7:13:9 | c |
 | test.ps1:11:6:11:8 | c | test.ps1:13:7:13:9 | c |
 | test.ps1:13:1:13:3 | d | test.ps1:14:6:14:8 | d |
@@ -33,17 +33,24 @@
 | test.ps1:13:6:13:10 | (...) | test.ps1:13:6:13:10 | (...) |
 | test.ps1:13:7:13:9 | c | test.ps1:13:6:13:10 | (...) |
 | test.ps1:13:7:13:9 | c | test.ps1:13:7:13:9 | c |
-| test.ps1:14:1:14:8 | Sink | test.ps1:14:1:14:8 | pre-return value for Sink |
-| test.ps1:14:1:14:8 | Sink | test.ps1:14:1:14:8 | pre-return value for Sink |
-| test.ps1:14:1:14:8 | implicit unwrapping of Sink | test.ps1:1:1:17:8 | return value for test.ps1 |
-| test.ps1:14:1:14:8 | pre-return value for Sink | test.ps1:14:1:14:8 | implicit unwrapping of Sink |
+| test.ps1:14:1:14:8 | call to Sink | test.ps1:14:1:14:8 | pre-return value for call to Sink |
+| test.ps1:14:1:14:8 | call to Sink | test.ps1:14:1:14:8 | pre-return value for call to Sink |
+| test.ps1:14:1:14:8 | implicit unwrapping of call to Sink | test.ps1:1:1:21:28 | return value for test.ps1 |
+| test.ps1:14:1:14:8 | pre-return value for call to Sink | test.ps1:14:1:14:8 | implicit unwrapping of call to Sink |
 | test.ps1:14:6:14:8 | [post] d | test.ps1:16:6:16:8 | d |
 | test.ps1:14:6:14:8 | d | test.ps1:16:6:16:8 | d |
 | test.ps1:16:1:16:3 | e | test.ps1:17:6:17:8 | e |
 | test.ps1:16:6:16:12 | ...+... | test.ps1:16:1:16:3 | e |
 | test.ps1:16:6:16:12 | ...+... | test.ps1:16:1:16:12 | ...=... |
 | test.ps1:16:6:16:12 | ...+... | test.ps1:16:6:16:12 | ...+... |
-| test.ps1:17:1:17:8 | Sink | test.ps1:17:1:17:8 | pre-return value for Sink |
-| test.ps1:17:1:17:8 | Sink | test.ps1:17:1:17:8 | pre-return value for Sink |
-| test.ps1:17:1:17:8 | implicit unwrapping of Sink | test.ps1:1:1:17:8 | return value for test.ps1 |
-| test.ps1:17:1:17:8 | pre-return value for Sink | test.ps1:17:1:17:8 | implicit unwrapping of Sink |
+| test.ps1:17:1:17:8 | call to Sink | test.ps1:17:1:17:8 | pre-return value for call to Sink |
+| test.ps1:17:1:17:8 | call to Sink | test.ps1:17:1:17:8 | pre-return value for call to Sink |
+| test.ps1:17:1:17:8 | implicit unwrapping of call to Sink | test.ps1:1:1:21:28 | return value for test.ps1 |
+| test.ps1:17:1:17:8 | pre-return value for call to Sink | test.ps1:17:1:17:8 | implicit unwrapping of call to Sink |
+| test.ps1:19:1:19:3 | f | test.ps1:21:25:21:27 | f |
+| test.ps1:19:6:19:12 | call to Source | test.ps1:19:1:19:3 | f |
+| test.ps1:19:6:19:12 | call to Source | test.ps1:19:1:19:12 | ...=... |
+| test.ps1:21:1:21:28 | call to Sink | test.ps1:21:1:21:28 | pre-return value for call to Sink |
+| test.ps1:21:1:21:28 | call to Sink | test.ps1:21:1:21:28 | pre-return value for call to Sink |
+| test.ps1:21:1:21:28 | implicit unwrapping of call to Sink | test.ps1:1:1:21:28 | return value for test.ps1 |
+| test.ps1:21:1:21:28 | pre-return value for call to Sink | test.ps1:21:1:21:28 | implicit unwrapping of call to Sink |
diff --git a/powershell/ql/test/library-tests/dataflow/local/taint.expected b/powershell/ql/test/library-tests/dataflow/local/taint.expected
index f6911381608..923c723a31f 100644
--- a/powershell/ql/test/library-tests/dataflow/local/taint.expected
+++ b/powershell/ql/test/library-tests/dataflow/local/taint.expected
@@ -1,33 +1,33 @@
 | test.ps1:1:1:1:4 | a1 | test.ps1:2:6:2:9 | a1 |
-| test.ps1:1:7:1:13 | Source | test.ps1:1:1:1:4 | a1 |
-| test.ps1:1:7:1:13 | Source | test.ps1:1:1:1:13 | ...=... |
-| test.ps1:2:1:2:9 | Sink | test.ps1:2:1:2:9 | pre-return value for Sink |
-| test.ps1:2:1:2:9 | Sink | test.ps1:2:1:2:9 | pre-return value for Sink |
-| test.ps1:2:1:2:9 | implicit unwrapping of Sink | test.ps1:1:1:17:8 | return value for test.ps1 |
-| test.ps1:2:1:2:9 | pre-return value for Sink | test.ps1:2:1:2:9 | implicit unwrapping of Sink |
-| test.ps1:2:1:2:9 | pre-return value for Sink | test.ps1:2:1:2:9 | implicit unwrapping of Sink |
+| test.ps1:1:7:1:13 | call to Source | test.ps1:1:1:1:4 | a1 |
+| test.ps1:1:7:1:13 | call to Source | test.ps1:1:1:1:13 | ...=... |
+| test.ps1:2:1:2:9 | call to Sink | test.ps1:2:1:2:9 | pre-return value for call to Sink |
+| test.ps1:2:1:2:9 | call to Sink | test.ps1:2:1:2:9 | pre-return value for call to Sink |
+| test.ps1:2:1:2:9 | implicit unwrapping of call to Sink | test.ps1:1:1:21:28 | return value for test.ps1 |
+| test.ps1:2:1:2:9 | pre-return value for call to Sink | test.ps1:2:1:2:9 | implicit unwrapping of call to Sink |
+| test.ps1:2:1:2:9 | pre-return value for call to Sink | test.ps1:2:1:2:9 | implicit unwrapping of call to Sink |
 | test.ps1:4:1:4:3 | b | test.ps1:5:4:5:6 | b |
-| test.ps1:4:6:4:13 | GetBool | test.ps1:4:1:4:3 | b |
-| test.ps1:4:6:4:13 | GetBool | test.ps1:4:1:4:13 | ...=... |
+| test.ps1:4:6:4:13 | call to GetBool | test.ps1:4:1:4:3 | b |
+| test.ps1:4:6:4:13 | call to GetBool | test.ps1:4:1:4:13 | ...=... |
 | test.ps1:5:4:5:6 | b | test.ps1:10:14:10:16 | b |
 | test.ps1:6:5:6:8 | a2 | test.ps1:8:6:8:9 | a2 |
-| test.ps1:6:11:6:17 | Source | test.ps1:6:5:6:8 | a2 |
-| test.ps1:6:11:6:17 | Source | test.ps1:6:5:6:17 | ...=... |
-| test.ps1:8:1:8:9 | Sink | test.ps1:8:1:8:9 | pre-return value for Sink |
-| test.ps1:8:1:8:9 | Sink | test.ps1:8:1:8:9 | pre-return value for Sink |
-| test.ps1:8:1:8:9 | implicit unwrapping of Sink | test.ps1:1:1:17:8 | return value for test.ps1 |
-| test.ps1:8:1:8:9 | pre-return value for Sink | test.ps1:8:1:8:9 | implicit unwrapping of Sink |
-| test.ps1:8:1:8:9 | pre-return value for Sink | test.ps1:8:1:8:9 | implicit unwrapping of Sink |
+| test.ps1:6:11:6:17 | call to Source | test.ps1:6:5:6:8 | a2 |
+| test.ps1:6:11:6:17 | call to Source | test.ps1:6:5:6:17 | ...=... |
+| test.ps1:8:1:8:9 | call to Sink | test.ps1:8:1:8:9 | pre-return value for call to Sink |
+| test.ps1:8:1:8:9 | call to Sink | test.ps1:8:1:8:9 | pre-return value for call to Sink |
+| test.ps1:8:1:8:9 | implicit unwrapping of call to Sink | test.ps1:1:1:21:28 | return value for test.ps1 |
+| test.ps1:8:1:8:9 | pre-return value for call to Sink | test.ps1:8:1:8:9 | implicit unwrapping of call to Sink |
+| test.ps1:8:1:8:9 | pre-return value for call to Sink | test.ps1:8:1:8:9 | implicit unwrapping of call to Sink |
 | test.ps1:10:1:10:3 | c | test.ps1:11:6:11:8 | c |
 | test.ps1:10:6:10:16 | [...]... | test.ps1:10:1:10:3 | c |
 | test.ps1:10:6:10:16 | [...]... | test.ps1:10:1:10:16 | ...=... |
 | test.ps1:10:6:10:16 | [...]... | test.ps1:10:6:10:16 | [...]... |
 | test.ps1:10:14:10:16 | b | test.ps1:10:6:10:16 | [...]... |
-| test.ps1:11:1:11:8 | Sink | test.ps1:11:1:11:8 | pre-return value for Sink |
-| test.ps1:11:1:11:8 | Sink | test.ps1:11:1:11:8 | pre-return value for Sink |
-| test.ps1:11:1:11:8 | implicit unwrapping of Sink | test.ps1:1:1:17:8 | return value for test.ps1 |
-| test.ps1:11:1:11:8 | pre-return value for Sink | test.ps1:11:1:11:8 | implicit unwrapping of Sink |
-| test.ps1:11:1:11:8 | pre-return value for Sink | test.ps1:11:1:11:8 | implicit unwrapping of Sink |
+| test.ps1:11:1:11:8 | call to Sink | test.ps1:11:1:11:8 | pre-return value for call to Sink |
+| test.ps1:11:1:11:8 | call to Sink | test.ps1:11:1:11:8 | pre-return value for call to Sink |
+| test.ps1:11:1:11:8 | implicit unwrapping of call to Sink | test.ps1:1:1:21:28 | return value for test.ps1 |
+| test.ps1:11:1:11:8 | pre-return value for call to Sink | test.ps1:11:1:11:8 | implicit unwrapping of call to Sink |
+| test.ps1:11:1:11:8 | pre-return value for call to Sink | test.ps1:11:1:11:8 | implicit unwrapping of call to Sink |
 | test.ps1:11:6:11:8 | [post] c | test.ps1:13:7:13:9 | c |
 | test.ps1:11:6:11:8 | c | test.ps1:13:7:13:9 | c |
 | test.ps1:13:1:13:3 | d | test.ps1:14:6:14:8 | d |
@@ -36,11 +36,11 @@
 | test.ps1:13:6:13:10 | (...) | test.ps1:13:6:13:10 | (...) |
 | test.ps1:13:7:13:9 | c | test.ps1:13:6:13:10 | (...) |
 | test.ps1:13:7:13:9 | c | test.ps1:13:7:13:9 | c |
-| test.ps1:14:1:14:8 | Sink | test.ps1:14:1:14:8 | pre-return value for Sink |
-| test.ps1:14:1:14:8 | Sink | test.ps1:14:1:14:8 | pre-return value for Sink |
-| test.ps1:14:1:14:8 | implicit unwrapping of Sink | test.ps1:1:1:17:8 | return value for test.ps1 |
-| test.ps1:14:1:14:8 | pre-return value for Sink | test.ps1:14:1:14:8 | implicit unwrapping of Sink |
-| test.ps1:14:1:14:8 | pre-return value for Sink | test.ps1:14:1:14:8 | implicit unwrapping of Sink |
+| test.ps1:14:1:14:8 | call to Sink | test.ps1:14:1:14:8 | pre-return value for call to Sink |
+| test.ps1:14:1:14:8 | call to Sink | test.ps1:14:1:14:8 | pre-return value for call to Sink |
+| test.ps1:14:1:14:8 | implicit unwrapping of call to Sink | test.ps1:1:1:21:28 | return value for test.ps1 |
+| test.ps1:14:1:14:8 | pre-return value for call to Sink | test.ps1:14:1:14:8 | implicit unwrapping of call to Sink |
+| test.ps1:14:1:14:8 | pre-return value for call to Sink | test.ps1:14:1:14:8 | implicit unwrapping of call to Sink |
 | test.ps1:14:6:14:8 | [post] d | test.ps1:16:6:16:8 | d |
 | test.ps1:14:6:14:8 | d | test.ps1:16:6:16:8 | d |
 | test.ps1:16:1:16:3 | e | test.ps1:17:6:17:8 | e |
@@ -49,8 +49,17 @@
 | test.ps1:16:6:16:12 | ...+... | test.ps1:16:1:16:12 | ...=... |
 | test.ps1:16:6:16:12 | ...+... | test.ps1:16:6:16:12 | ...+... |
 | test.ps1:16:11:16:12 | 1 | test.ps1:16:6:16:12 | ...+... |
-| test.ps1:17:1:17:8 | Sink | test.ps1:17:1:17:8 | pre-return value for Sink |
-| test.ps1:17:1:17:8 | Sink | test.ps1:17:1:17:8 | pre-return value for Sink |
-| test.ps1:17:1:17:8 | implicit unwrapping of Sink | test.ps1:1:1:17:8 | return value for test.ps1 |
-| test.ps1:17:1:17:8 | pre-return value for Sink | test.ps1:17:1:17:8 | implicit unwrapping of Sink |
-| test.ps1:17:1:17:8 | pre-return value for Sink | test.ps1:17:1:17:8 | implicit unwrapping of Sink |
+| test.ps1:17:1:17:8 | call to Sink | test.ps1:17:1:17:8 | pre-return value for call to Sink |
+| test.ps1:17:1:17:8 | call to Sink | test.ps1:17:1:17:8 | pre-return value for call to Sink |
+| test.ps1:17:1:17:8 | implicit unwrapping of call to Sink | test.ps1:1:1:21:28 | return value for test.ps1 |
+| test.ps1:17:1:17:8 | pre-return value for call to Sink | test.ps1:17:1:17:8 | implicit unwrapping of call to Sink |
+| test.ps1:17:1:17:8 | pre-return value for call to Sink | test.ps1:17:1:17:8 | implicit unwrapping of call to Sink |
+| test.ps1:19:1:19:3 | f | test.ps1:21:25:21:27 | f |
+| test.ps1:19:6:19:12 | call to Source | test.ps1:19:1:19:3 | f |
+| test.ps1:19:6:19:12 | call to Source | test.ps1:19:1:19:12 | ...=... |
+| test.ps1:21:1:21:28 | call to Sink | test.ps1:21:1:21:28 | pre-return value for call to Sink |
+| test.ps1:21:1:21:28 | call to Sink | test.ps1:21:1:21:28 | pre-return value for call to Sink |
+| test.ps1:21:1:21:28 | implicit unwrapping of call to Sink | test.ps1:1:1:21:28 | return value for test.ps1 |
+| test.ps1:21:1:21:28 | pre-return value for call to Sink | test.ps1:21:1:21:28 | implicit unwrapping of call to Sink |
+| test.ps1:21:1:21:28 | pre-return value for call to Sink | test.ps1:21:1:21:28 | implicit unwrapping of call to Sink |
+| test.ps1:21:25:21:27 | f | test.ps1:21:6:21:28 | here is a string: $f |
diff --git a/powershell/ql/test/library-tests/dataflow/local/test.ps1 b/powershell/ql/test/library-tests/dataflow/local/test.ps1
index 4497ad23dd7..4e18ffb1f11 100644
--- a/powershell/ql/test/library-tests/dataflow/local/test.ps1
+++ b/powershell/ql/test/library-tests/dataflow/local/test.ps1
@@ -14,4 +14,8 @@ $d = ($c)
 Sink $d
 
 $e = $d + 1
-Sink $e
\ No newline at end of file
+Sink $e
+
+$f = Source
+
+Sink "here is a string: $f"
\ No newline at end of file
diff --git a/powershell/ql/test/library-tests/dataflow/params/test.expected b/powershell/ql/test/library-tests/dataflow/params/test.expected
index aebf81055dd..2387ed8cbcf 100644
--- a/powershell/ql/test/library-tests/dataflow/params/test.expected
+++ b/powershell/ql/test/library-tests/dataflow/params/test.expected
@@ -5,77 +5,77 @@ edges
 | global.ps1:1:43:1:59 | Source3 | global.ps1:5:6:5:14 | Source3 | provenance |  |
 | global.ps1:1:61:1:77 | Source4 | global.ps1:6:6:6:14 | Source4 | provenance |  |
 | test.ps1:1:14:1:16 | a | test.ps1:2:10:2:12 | a | provenance |  |
-| test.ps1:5:6:5:16 | Source | test.ps1:6:5:6:7 | x | provenance |  |
+| test.ps1:5:6:5:16 | call to Source | test.ps1:6:5:6:7 | x | provenance |  |
 | test.ps1:6:5:6:7 | x | test.ps1:1:14:1:16 | a | provenance |  |
 | test.ps1:8:20:8:22 | x | test.ps1:9:10:9:12 | x | provenance |  |
 | test.ps1:8:24:8:26 | y | test.ps1:10:10:10:12 | y | provenance |  |
 | test.ps1:8:28:8:30 | z | test.ps1:11:10:11:12 | z | provenance |  |
-| test.ps1:14:10:14:20 | Source | test.ps1:18:11:18:17 | first | provenance |  |
-| test.ps1:14:10:14:20 | Source | test.ps1:19:22:19:28 | first | provenance |  |
-| test.ps1:14:10:14:20 | Source | test.ps1:20:14:20:20 | first | provenance |  |
-| test.ps1:14:10:14:20 | Source | test.ps1:21:11:21:17 | first | provenance |  |
-| test.ps1:14:10:14:20 | Source | test.ps1:22:22:22:28 | first | provenance |  |
-| test.ps1:14:10:14:20 | Source | test.ps1:23:22:23:28 | first | provenance |  |
-| test.ps1:14:10:14:20 | Source | test.ps1:24:14:24:20 | first | provenance |  |
-| test.ps1:14:10:14:20 | Source | test.ps1:25:11:25:17 | first | provenance |  |
-| test.ps1:14:10:14:20 | Source | test.ps1:26:22:26:28 | first | provenance |  |
-| test.ps1:14:10:14:20 | Source | test.ps1:27:22:27:28 | first | provenance |  |
-| test.ps1:14:10:14:20 | Source | test.ps1:28:14:28:20 | first | provenance |  |
-| test.ps1:14:10:14:20 | Source | test.ps1:29:11:29:17 | first | provenance |  |
-| test.ps1:14:10:14:20 | Source | test.ps1:30:32:30:38 | first | provenance |  |
-| test.ps1:14:10:14:20 | Source | test.ps1:31:32:31:38 | first | provenance |  |
-| test.ps1:14:10:14:20 | Source | test.ps1:32:14:32:20 | first | provenance |  |
-| test.ps1:14:10:14:20 | Source | test.ps1:33:11:33:17 | first | provenance |  |
-| test.ps1:14:10:14:20 | Source | test.ps1:34:32:34:38 | first | provenance |  |
-| test.ps1:14:10:14:20 | Source | test.ps1:35:32:35:38 | first | provenance |  |
-| test.ps1:14:10:14:20 | Source | test.ps1:36:32:36:38 | first | provenance |  |
-| test.ps1:14:10:14:20 | Source | test.ps1:37:24:37:30 | first | provenance |  |
-| test.ps1:14:10:14:20 | Source | test.ps1:38:21:38:27 | first | provenance |  |
-| test.ps1:14:10:14:20 | Source | test.ps1:39:32:39:38 | first | provenance |  |
-| test.ps1:15:11:15:21 | Source | test.ps1:18:18:18:25 | second | provenance |  |
-| test.ps1:15:11:15:21 | Source | test.ps1:19:11:19:18 | second | provenance |  |
-| test.ps1:15:11:15:21 | Source | test.ps1:20:21:20:28 | second | provenance |  |
-| test.ps1:15:11:15:21 | Source | test.ps1:21:21:21:28 | second | provenance |  |
-| test.ps1:15:11:15:21 | Source | test.ps1:22:14:22:21 | second | provenance |  |
-| test.ps1:15:11:15:21 | Source | test.ps1:23:11:23:18 | second | provenance |  |
-| test.ps1:15:11:15:21 | Source | test.ps1:24:21:24:28 | second | provenance |  |
-| test.ps1:15:11:15:21 | Source | test.ps1:25:21:25:28 | second | provenance |  |
-| test.ps1:15:11:15:21 | Source | test.ps1:26:14:26:21 | second | provenance |  |
-| test.ps1:15:11:15:21 | Source | test.ps1:27:11:27:18 | second | provenance |  |
-| test.ps1:15:11:15:21 | Source | test.ps1:28:31:28:38 | second | provenance |  |
-| test.ps1:15:11:15:21 | Source | test.ps1:29:21:29:28 | second | provenance |  |
-| test.ps1:15:11:15:21 | Source | test.ps1:30:14:30:21 | second | provenance |  |
-| test.ps1:15:11:15:21 | Source | test.ps1:31:11:31:18 | second | provenance |  |
-| test.ps1:15:11:15:21 | Source | test.ps1:32:31:32:38 | second | provenance |  |
-| test.ps1:15:11:15:21 | Source | test.ps1:33:31:33:38 | second | provenance |  |
-| test.ps1:15:11:15:21 | Source | test.ps1:34:14:34:21 | second | provenance |  |
-| test.ps1:15:11:15:21 | Source | test.ps1:35:24:35:31 | second | provenance |  |
-| test.ps1:15:11:15:21 | Source | test.ps1:36:21:36:28 | second | provenance |  |
-| test.ps1:15:11:15:21 | Source | test.ps1:37:31:37:38 | second | provenance |  |
-| test.ps1:15:11:15:21 | Source | test.ps1:38:31:38:38 | second | provenance |  |
-| test.ps1:15:11:15:21 | Source | test.ps1:39:24:39:31 | second | provenance |  |
-| test.ps1:16:10:16:20 | Source | test.ps1:18:26:18:32 | third | provenance |  |
-| test.ps1:16:10:16:20 | Source | test.ps1:19:29:19:35 | third | provenance |  |
-| test.ps1:16:10:16:20 | Source | test.ps1:20:29:20:35 | third | provenance |  |
-| test.ps1:16:10:16:20 | Source | test.ps1:21:29:21:35 | third | provenance |  |
-| test.ps1:16:10:16:20 | Source | test.ps1:22:29:22:35 | third | provenance |  |
-| test.ps1:16:10:16:20 | Source | test.ps1:23:32:23:38 | third | provenance |  |
-| test.ps1:16:10:16:20 | Source | test.ps1:24:32:24:38 | third | provenance |  |
-| test.ps1:16:10:16:20 | Source | test.ps1:25:32:25:38 | third | provenance |  |
-| test.ps1:16:10:16:20 | Source | test.ps1:26:32:26:38 | third | provenance |  |
-| test.ps1:16:10:16:20 | Source | test.ps1:27:32:27:38 | third | provenance |  |
-| test.ps1:16:10:16:20 | Source | test.ps1:28:24:28:30 | third | provenance |  |
-| test.ps1:16:10:16:20 | Source | test.ps1:29:32:29:38 | third | provenance |  |
-| test.ps1:16:10:16:20 | Source | test.ps1:30:25:30:31 | third | provenance |  |
-| test.ps1:16:10:16:20 | Source | test.ps1:31:22:31:28 | third | provenance |  |
-| test.ps1:16:10:16:20 | Source | test.ps1:32:24:32:30 | third | provenance |  |
-| test.ps1:16:10:16:20 | Source | test.ps1:33:21:33:27 | third | provenance |  |
-| test.ps1:16:10:16:20 | Source | test.ps1:34:25:34:31 | third | provenance |  |
-| test.ps1:16:10:16:20 | Source | test.ps1:35:14:35:20 | third | provenance |  |
-| test.ps1:16:10:16:20 | Source | test.ps1:36:14:36:20 | third | provenance |  |
-| test.ps1:16:10:16:20 | Source | test.ps1:37:14:37:20 | third | provenance |  |
-| test.ps1:16:10:16:20 | Source | test.ps1:38:14:38:20 | third | provenance |  |
-| test.ps1:16:10:16:20 | Source | test.ps1:39:14:39:20 | third | provenance |  |
+| test.ps1:14:10:14:20 | call to Source | test.ps1:18:11:18:17 | first | provenance |  |
+| test.ps1:14:10:14:20 | call to Source | test.ps1:19:22:19:28 | first | provenance |  |
+| test.ps1:14:10:14:20 | call to Source | test.ps1:20:14:20:20 | first | provenance |  |
+| test.ps1:14:10:14:20 | call to Source | test.ps1:21:11:21:17 | first | provenance |  |
+| test.ps1:14:10:14:20 | call to Source | test.ps1:22:22:22:28 | first | provenance |  |
+| test.ps1:14:10:14:20 | call to Source | test.ps1:23:22:23:28 | first | provenance |  |
+| test.ps1:14:10:14:20 | call to Source | test.ps1:24:14:24:20 | first | provenance |  |
+| test.ps1:14:10:14:20 | call to Source | test.ps1:25:11:25:17 | first | provenance |  |
+| test.ps1:14:10:14:20 | call to Source | test.ps1:26:22:26:28 | first | provenance |  |
+| test.ps1:14:10:14:20 | call to Source | test.ps1:27:22:27:28 | first | provenance |  |
+| test.ps1:14:10:14:20 | call to Source | test.ps1:28:14:28:20 | first | provenance |  |
+| test.ps1:14:10:14:20 | call to Source | test.ps1:29:11:29:17 | first | provenance |  |
+| test.ps1:14:10:14:20 | call to Source | test.ps1:30:32:30:38 | first | provenance |  |
+| test.ps1:14:10:14:20 | call to Source | test.ps1:31:32:31:38 | first | provenance |  |
+| test.ps1:14:10:14:20 | call to Source | test.ps1:32:14:32:20 | first | provenance |  |
+| test.ps1:14:10:14:20 | call to Source | test.ps1:33:11:33:17 | first | provenance |  |
+| test.ps1:14:10:14:20 | call to Source | test.ps1:34:32:34:38 | first | provenance |  |
+| test.ps1:14:10:14:20 | call to Source | test.ps1:35:32:35:38 | first | provenance |  |
+| test.ps1:14:10:14:20 | call to Source | test.ps1:36:32:36:38 | first | provenance |  |
+| test.ps1:14:10:14:20 | call to Source | test.ps1:37:24:37:30 | first | provenance |  |
+| test.ps1:14:10:14:20 | call to Source | test.ps1:38:21:38:27 | first | provenance |  |
+| test.ps1:14:10:14:20 | call to Source | test.ps1:39:32:39:38 | first | provenance |  |
+| test.ps1:15:11:15:21 | call to Source | test.ps1:18:18:18:25 | second | provenance |  |
+| test.ps1:15:11:15:21 | call to Source | test.ps1:19:11:19:18 | second | provenance |  |
+| test.ps1:15:11:15:21 | call to Source | test.ps1:20:21:20:28 | second | provenance |  |
+| test.ps1:15:11:15:21 | call to Source | test.ps1:21:21:21:28 | second | provenance |  |
+| test.ps1:15:11:15:21 | call to Source | test.ps1:22:14:22:21 | second | provenance |  |
+| test.ps1:15:11:15:21 | call to Source | test.ps1:23:11:23:18 | second | provenance |  |
+| test.ps1:15:11:15:21 | call to Source | test.ps1:24:21:24:28 | second | provenance |  |
+| test.ps1:15:11:15:21 | call to Source | test.ps1:25:21:25:28 | second | provenance |  |
+| test.ps1:15:11:15:21 | call to Source | test.ps1:26:14:26:21 | second | provenance |  |
+| test.ps1:15:11:15:21 | call to Source | test.ps1:27:11:27:18 | second | provenance |  |
+| test.ps1:15:11:15:21 | call to Source | test.ps1:28:31:28:38 | second | provenance |  |
+| test.ps1:15:11:15:21 | call to Source | test.ps1:29:21:29:28 | second | provenance |  |
+| test.ps1:15:11:15:21 | call to Source | test.ps1:30:14:30:21 | second | provenance |  |
+| test.ps1:15:11:15:21 | call to Source | test.ps1:31:11:31:18 | second | provenance |  |
+| test.ps1:15:11:15:21 | call to Source | test.ps1:32:31:32:38 | second | provenance |  |
+| test.ps1:15:11:15:21 | call to Source | test.ps1:33:31:33:38 | second | provenance |  |
+| test.ps1:15:11:15:21 | call to Source | test.ps1:34:14:34:21 | second | provenance |  |
+| test.ps1:15:11:15:21 | call to Source | test.ps1:35:24:35:31 | second | provenance |  |
+| test.ps1:15:11:15:21 | call to Source | test.ps1:36:21:36:28 | second | provenance |  |
+| test.ps1:15:11:15:21 | call to Source | test.ps1:37:31:37:38 | second | provenance |  |
+| test.ps1:15:11:15:21 | call to Source | test.ps1:38:31:38:38 | second | provenance |  |
+| test.ps1:15:11:15:21 | call to Source | test.ps1:39:24:39:31 | second | provenance |  |
+| test.ps1:16:10:16:20 | call to Source | test.ps1:18:26:18:32 | third | provenance |  |
+| test.ps1:16:10:16:20 | call to Source | test.ps1:19:29:19:35 | third | provenance |  |
+| test.ps1:16:10:16:20 | call to Source | test.ps1:20:29:20:35 | third | provenance |  |
+| test.ps1:16:10:16:20 | call to Source | test.ps1:21:29:21:35 | third | provenance |  |
+| test.ps1:16:10:16:20 | call to Source | test.ps1:22:29:22:35 | third | provenance |  |
+| test.ps1:16:10:16:20 | call to Source | test.ps1:23:32:23:38 | third | provenance |  |
+| test.ps1:16:10:16:20 | call to Source | test.ps1:24:32:24:38 | third | provenance |  |
+| test.ps1:16:10:16:20 | call to Source | test.ps1:25:32:25:38 | third | provenance |  |
+| test.ps1:16:10:16:20 | call to Source | test.ps1:26:32:26:38 | third | provenance |  |
+| test.ps1:16:10:16:20 | call to Source | test.ps1:27:32:27:38 | third | provenance |  |
+| test.ps1:16:10:16:20 | call to Source | test.ps1:28:24:28:30 | third | provenance |  |
+| test.ps1:16:10:16:20 | call to Source | test.ps1:29:32:29:38 | third | provenance |  |
+| test.ps1:16:10:16:20 | call to Source | test.ps1:30:25:30:31 | third | provenance |  |
+| test.ps1:16:10:16:20 | call to Source | test.ps1:31:22:31:28 | third | provenance |  |
+| test.ps1:16:10:16:20 | call to Source | test.ps1:32:24:32:30 | third | provenance |  |
+| test.ps1:16:10:16:20 | call to Source | test.ps1:33:21:33:27 | third | provenance |  |
+| test.ps1:16:10:16:20 | call to Source | test.ps1:34:25:34:31 | third | provenance |  |
+| test.ps1:16:10:16:20 | call to Source | test.ps1:35:14:35:20 | third | provenance |  |
+| test.ps1:16:10:16:20 | call to Source | test.ps1:36:14:36:20 | third | provenance |  |
+| test.ps1:16:10:16:20 | call to Source | test.ps1:37:14:37:20 | third | provenance |  |
+| test.ps1:16:10:16:20 | call to Source | test.ps1:38:14:38:20 | third | provenance |  |
+| test.ps1:16:10:16:20 | call to Source | test.ps1:39:14:39:20 | third | provenance |  |
 | test.ps1:18:11:18:17 | first | test.ps1:8:20:8:22 | x | provenance |  |
 | test.ps1:18:18:18:25 | second | test.ps1:8:24:8:26 | y | provenance |  |
 | test.ps1:18:26:18:32 | third | test.ps1:8:28:8:30 | z | provenance |  |
@@ -153,7 +153,7 @@ nodes
 | global.ps1:6:6:6:14 | Source4 | semmle.label | Source4 |
 | test.ps1:1:14:1:16 | a | semmle.label | a |
 | test.ps1:2:10:2:12 | a | semmle.label | a |
-| test.ps1:5:6:5:16 | Source | semmle.label | Source |
+| test.ps1:5:6:5:16 | call to Source | semmle.label | call to Source |
 | test.ps1:6:5:6:7 | x | semmle.label | x |
 | test.ps1:8:20:8:22 | x | semmle.label | x |
 | test.ps1:8:24:8:26 | y | semmle.label | y |
@@ -161,9 +161,9 @@ nodes
 | test.ps1:9:10:9:12 | x | semmle.label | x |
 | test.ps1:10:10:10:12 | y | semmle.label | y |
 | test.ps1:11:10:11:12 | z | semmle.label | z |
-| test.ps1:14:10:14:20 | Source | semmle.label | Source |
-| test.ps1:15:11:15:21 | Source | semmle.label | Source |
-| test.ps1:16:10:16:20 | Source | semmle.label | Source |
+| test.ps1:14:10:14:20 | call to Source | semmle.label | call to Source |
+| test.ps1:15:11:15:21 | call to Source | semmle.label | call to Source |
+| test.ps1:16:10:16:20 | call to Source | semmle.label | call to Source |
 | test.ps1:18:11:18:17 | first | semmle.label | first |
 | test.ps1:18:18:18:25 | second | semmle.label | second |
 | test.ps1:18:26:18:32 | third | semmle.label | third |
@@ -237,7 +237,7 @@ testFailures
 | global.ps1:4:6:4:14 | Source2 | global.ps1:1:25:1:41 | Source2 | global.ps1:4:6:4:14 | Source2 | $@ | global.ps1:1:25:1:41 | Source2 | Source2 |
 | global.ps1:5:6:5:14 | Source3 | global.ps1:1:43:1:59 | Source3 | global.ps1:5:6:5:14 | Source3 | $@ | global.ps1:1:43:1:59 | Source3 | Source3 |
 | global.ps1:6:6:6:14 | Source4 | global.ps1:1:61:1:77 | Source4 | global.ps1:6:6:6:14 | Source4 | $@ | global.ps1:1:61:1:77 | Source4 | Source4 |
-| test.ps1:2:10:2:12 | a | test.ps1:5:6:5:16 | Source | test.ps1:2:10:2:12 | a | $@ | test.ps1:5:6:5:16 | Source | Source |
-| test.ps1:9:10:9:12 | x | test.ps1:14:10:14:20 | Source | test.ps1:9:10:9:12 | x | $@ | test.ps1:14:10:14:20 | Source | Source |
-| test.ps1:10:10:10:12 | y | test.ps1:15:11:15:21 | Source | test.ps1:10:10:10:12 | y | $@ | test.ps1:15:11:15:21 | Source | Source |
-| test.ps1:11:10:11:12 | z | test.ps1:16:10:16:20 | Source | test.ps1:11:10:11:12 | z | $@ | test.ps1:16:10:16:20 | Source | Source |
+| test.ps1:2:10:2:12 | a | test.ps1:5:6:5:16 | call to Source | test.ps1:2:10:2:12 | a | $@ | test.ps1:5:6:5:16 | call to Source | call to Source |
+| test.ps1:9:10:9:12 | x | test.ps1:14:10:14:20 | call to Source | test.ps1:9:10:9:12 | x | $@ | test.ps1:14:10:14:20 | call to Source | call to Source |
+| test.ps1:10:10:10:12 | y | test.ps1:15:11:15:21 | call to Source | test.ps1:10:10:10:12 | y | $@ | test.ps1:15:11:15:21 | call to Source | call to Source |
+| test.ps1:11:10:11:12 | z | test.ps1:16:10:16:20 | call to Source | test.ps1:11:10:11:12 | z | $@ | test.ps1:16:10:16:20 | call to Source | call to Source |
diff --git a/powershell/ql/test/library-tests/dataflow/pipeline/test.expected b/powershell/ql/test/library-tests/dataflow/pipeline/test.expected
index 216359016c7..12b6de837cb 100644
--- a/powershell/ql/test/library-tests/dataflow/pipeline/test.expected
+++ b/powershell/ql/test/library-tests/dataflow/pipeline/test.expected
@@ -1,19 +1,19 @@
 models
 edges
-| test.ps1:2:10:2:20 | Source | test.ps1:5:5:5:7 | x | provenance |  |
-| test.ps1:3:10:3:20 | Source | test.ps1:6:5:6:7 | y | provenance |  |
-| test.ps1:4:10:4:20 | Source | test.ps1:6:9:6:11 | z | provenance |  |
-| test.ps1:5:5:5:7 | x | test.ps1:17:1:17:8 | produce [element] | provenance |  |
+| test.ps1:2:10:2:20 | call to Source | test.ps1:5:5:5:7 | x | provenance |  |
+| test.ps1:3:10:3:20 | call to Source | test.ps1:6:5:6:7 | y | provenance |  |
+| test.ps1:4:10:4:20 | call to Source | test.ps1:6:9:6:11 | z | provenance |  |
+| test.ps1:5:5:5:7 | x | test.ps1:17:1:17:8 | call to produce [element] | provenance |  |
 | test.ps1:6:5:6:7 | y | test.ps1:6:5:6:11 | ...,... [element 0] | provenance |  |
-| test.ps1:6:5:6:11 | ...,... [element 0] | test.ps1:17:1:17:8 | produce [element] | provenance |  |
-| test.ps1:6:5:6:11 | ...,... [element 1] | test.ps1:17:1:17:8 | produce [element] | provenance |  |
+| test.ps1:6:5:6:11 | ...,... [element 0] | test.ps1:17:1:17:8 | call to produce [element] | provenance |  |
+| test.ps1:6:5:6:11 | ...,... [element 1] | test.ps1:17:1:17:8 | call to produce [element] | provenance |  |
 | test.ps1:6:9:6:11 | z | test.ps1:6:5:6:11 | ...,... [element 1] | provenance |  |
 | test.ps1:10:11:10:44 | x [element 0] | test.ps1:13:14:13:16 | x | provenance |  |
 | test.ps1:10:11:10:44 | x [element 1] | test.ps1:13:14:13:16 | x | provenance |  |
 | test.ps1:10:11:10:44 | x [element] | test.ps1:13:14:13:16 | x | provenance |  |
-| test.ps1:17:1:17:8 | produce [element] | test.ps1:10:11:10:44 | x [element] | provenance |  |
-| test.ps1:19:6:19:16 | Source | test.ps1:21:1:21:3 | x | provenance |  |
-| test.ps1:20:6:20:16 | Source | test.ps1:21:5:21:7 | y | provenance |  |
+| test.ps1:17:1:17:8 | call to produce [element] | test.ps1:10:11:10:44 | x [element] | provenance |  |
+| test.ps1:19:6:19:16 | call to Source | test.ps1:21:1:21:3 | x | provenance |  |
+| test.ps1:20:6:20:16 | call to Source | test.ps1:21:5:21:7 | y | provenance |  |
 | test.ps1:21:1:21:3 | x | test.ps1:21:1:21:7 | ...,... [element 0] | provenance |  |
 | test.ps1:21:1:21:7 | ...,... [element 0] | test.ps1:10:11:10:44 | x [element 0] | provenance |  |
 | test.ps1:21:1:21:7 | ...,... [element 0] | test.ps1:21:1:21:7 | ...,... [element 0] | provenance |  |
@@ -22,8 +22,8 @@ edges
 | test.ps1:21:5:21:7 | y | test.ps1:21:1:21:7 | ...,... [element 1] | provenance |  |
 | test.ps1:25:14:25:16 | _ [element 0] | test.ps1:25:14:25:16 | _ | provenance |  |
 | test.ps1:25:14:25:16 | _ [element 1] | test.ps1:25:14:25:16 | _ | provenance |  |
-| test.ps1:29:6:29:16 | Source | test.ps1:31:1:31:3 | x | provenance |  |
-| test.ps1:30:6:30:16 | Source | test.ps1:31:5:31:7 | y | provenance |  |
+| test.ps1:29:6:29:16 | call to Source | test.ps1:31:1:31:3 | x | provenance |  |
+| test.ps1:30:6:30:16 | call to Source | test.ps1:31:5:31:7 | y | provenance |  |
 | test.ps1:31:1:31:3 | x | test.ps1:31:1:31:7 | ...,... [element 0] | provenance |  |
 | test.ps1:31:1:31:7 | ...,... [element 0] | test.ps1:25:14:25:16 | _ [element 0] | provenance |  |
 | test.ps1:31:1:31:7 | ...,... [element 0] | test.ps1:31:1:31:7 | ...,... [element 0] | provenance |  |
@@ -31,7 +31,7 @@ edges
 | test.ps1:31:1:31:7 | ...,... [element 1] | test.ps1:31:1:31:7 | ...,... [element 1] | provenance |  |
 | test.ps1:31:5:31:7 | y | test.ps1:31:1:31:7 | ...,... [element 1] | provenance |  |
 | test.ps1:34:11:34:58 | x [element x] | test.ps1:36:10:36:12 | x | provenance |  |
-| test.ps1:39:6:39:16 | Source | test.ps1:40:23:40:25 | x | provenance |  |
+| test.ps1:39:6:39:16 | call to Source | test.ps1:40:23:40:25 | x | provenance |  |
 | test.ps1:40:1:40:26 | [...]... [element x] | test.ps1:34:11:34:58 | x [element x] | provenance |  |
 | test.ps1:40:17:40:26 | ${...} [element x] | test.ps1:40:1:40:26 | [...]... [element x] | provenance |  |
 | test.ps1:40:23:40:25 | x | test.ps1:40:17:40:26 | ${...} [element x] | provenance |  |
@@ -46,17 +46,17 @@ edges
 | test.ps1:50:1:50:106 | ...,... [element 2, element x] | test.ps1:43:11:43:58 | x [element 2, element x] | provenance |  |
 | test.ps1:50:1:50:106 | ...,... [element 2, element x] | test.ps1:50:1:50:106 | ...,... [element 2, element x] | provenance |  |
 | test.ps1:50:17:50:34 | ${...} [element x] | test.ps1:50:1:50:34 | [...]... [element x] | provenance |  |
-| test.ps1:50:23:50:33 | Source | test.ps1:50:17:50:34 | ${...} [element x] | provenance |  |
+| test.ps1:50:23:50:33 | call to Source | test.ps1:50:17:50:34 | ${...} [element x] | provenance |  |
 | test.ps1:50:36:50:70 | [...]... [element x] | test.ps1:50:1:50:106 | ...,... [element 1, element x] | provenance |  |
 | test.ps1:50:52:50:70 | ${...} [element x] | test.ps1:50:36:50:70 | [...]... [element x] | provenance |  |
-| test.ps1:50:58:50:69 | Source | test.ps1:50:52:50:70 | ${...} [element x] | provenance |  |
+| test.ps1:50:58:50:69 | call to Source | test.ps1:50:52:50:70 | ${...} [element x] | provenance |  |
 | test.ps1:50:72:50:106 | [...]... [element x] | test.ps1:50:1:50:106 | ...,... [element 2, element x] | provenance |  |
 | test.ps1:50:88:50:106 | ${...} [element x] | test.ps1:50:72:50:106 | [...]... [element x] | provenance |  |
-| test.ps1:50:94:50:105 | Source | test.ps1:50:88:50:106 | ${...} [element x] | provenance |  |
+| test.ps1:50:94:50:105 | call to Source | test.ps1:50:88:50:106 | ${...} [element x] | provenance |  |
 nodes
-| test.ps1:2:10:2:20 | Source | semmle.label | Source |
-| test.ps1:3:10:3:20 | Source | semmle.label | Source |
-| test.ps1:4:10:4:20 | Source | semmle.label | Source |
+| test.ps1:2:10:2:20 | call to Source | semmle.label | call to Source |
+| test.ps1:3:10:3:20 | call to Source | semmle.label | call to Source |
+| test.ps1:4:10:4:20 | call to Source | semmle.label | call to Source |
 | test.ps1:5:5:5:7 | x | semmle.label | x |
 | test.ps1:6:5:6:7 | y | semmle.label | y |
 | test.ps1:6:5:6:11 | ...,... [element 0] | semmle.label | ...,... [element 0] |
@@ -66,9 +66,9 @@ nodes
 | test.ps1:10:11:10:44 | x [element 1] | semmle.label | x [element 1] |
 | test.ps1:10:11:10:44 | x [element] | semmle.label | x [element] |
 | test.ps1:13:14:13:16 | x | semmle.label | x |
-| test.ps1:17:1:17:8 | produce [element] | semmle.label | produce [element] |
-| test.ps1:19:6:19:16 | Source | semmle.label | Source |
-| test.ps1:20:6:20:16 | Source | semmle.label | Source |
+| test.ps1:17:1:17:8 | call to produce [element] | semmle.label | call to produce [element] |
+| test.ps1:19:6:19:16 | call to Source | semmle.label | call to Source |
+| test.ps1:20:6:20:16 | call to Source | semmle.label | call to Source |
 | test.ps1:21:1:21:3 | x | semmle.label | x |
 | test.ps1:21:1:21:7 | ...,... [element 0] | semmle.label | ...,... [element 0] |
 | test.ps1:21:1:21:7 | ...,... [element 0] | semmle.label | ...,... [element 0] |
@@ -78,8 +78,8 @@ nodes
 | test.ps1:25:14:25:16 | _ | semmle.label | _ |
 | test.ps1:25:14:25:16 | _ [element 0] | semmle.label | _ [element 0] |
 | test.ps1:25:14:25:16 | _ [element 1] | semmle.label | _ [element 1] |
-| test.ps1:29:6:29:16 | Source | semmle.label | Source |
-| test.ps1:30:6:30:16 | Source | semmle.label | Source |
+| test.ps1:29:6:29:16 | call to Source | semmle.label | call to Source |
+| test.ps1:30:6:30:16 | call to Source | semmle.label | call to Source |
 | test.ps1:31:1:31:3 | x | semmle.label | x |
 | test.ps1:31:1:31:7 | ...,... [element 0] | semmle.label | ...,... [element 0] |
 | test.ps1:31:1:31:7 | ...,... [element 0] | semmle.label | ...,... [element 0] |
@@ -88,7 +88,7 @@ nodes
 | test.ps1:31:5:31:7 | y | semmle.label | y |
 | test.ps1:34:11:34:58 | x [element x] | semmle.label | x [element x] |
 | test.ps1:36:10:36:12 | x | semmle.label | x |
-| test.ps1:39:6:39:16 | Source | semmle.label | Source |
+| test.ps1:39:6:39:16 | call to Source | semmle.label | call to Source |
 | test.ps1:40:1:40:26 | [...]... [element x] | semmle.label | [...]... [element x] |
 | test.ps1:40:17:40:26 | ${...} [element x] | semmle.label | ${...} [element x] |
 | test.ps1:40:23:40:25 | x | semmle.label | x |
@@ -104,24 +104,24 @@ nodes
 | test.ps1:50:1:50:106 | ...,... [element 2, element x] | semmle.label | ...,... [element 2, element x] |
 | test.ps1:50:1:50:106 | ...,... [element 2, element x] | semmle.label | ...,... [element 2, element x] |
 | test.ps1:50:17:50:34 | ${...} [element x] | semmle.label | ${...} [element x] |
-| test.ps1:50:23:50:33 | Source | semmle.label | Source |
+| test.ps1:50:23:50:33 | call to Source | semmle.label | call to Source |
 | test.ps1:50:36:50:70 | [...]... [element x] | semmle.label | [...]... [element x] |
 | test.ps1:50:52:50:70 | ${...} [element x] | semmle.label | ${...} [element x] |
-| test.ps1:50:58:50:69 | Source | semmle.label | Source |
+| test.ps1:50:58:50:69 | call to Source | semmle.label | call to Source |
 | test.ps1:50:72:50:106 | [...]... [element x] | semmle.label | [...]... [element x] |
 | test.ps1:50:88:50:106 | ${...} [element x] | semmle.label | ${...} [element x] |
-| test.ps1:50:94:50:105 | Source | semmle.label | Source |
+| test.ps1:50:94:50:105 | call to Source | semmle.label | call to Source |
 subpaths
 testFailures
 #select
-| test.ps1:13:14:13:16 | x | test.ps1:2:10:2:20 | Source | test.ps1:13:14:13:16 | x | $@ | test.ps1:2:10:2:20 | Source | Source |
-| test.ps1:13:14:13:16 | x | test.ps1:3:10:3:20 | Source | test.ps1:13:14:13:16 | x | $@ | test.ps1:3:10:3:20 | Source | Source |
-| test.ps1:13:14:13:16 | x | test.ps1:4:10:4:20 | Source | test.ps1:13:14:13:16 | x | $@ | test.ps1:4:10:4:20 | Source | Source |
-| test.ps1:13:14:13:16 | x | test.ps1:19:6:19:16 | Source | test.ps1:13:14:13:16 | x | $@ | test.ps1:19:6:19:16 | Source | Source |
-| test.ps1:13:14:13:16 | x | test.ps1:20:6:20:16 | Source | test.ps1:13:14:13:16 | x | $@ | test.ps1:20:6:20:16 | Source | Source |
-| test.ps1:25:14:25:16 | _ | test.ps1:29:6:29:16 | Source | test.ps1:25:14:25:16 | _ | $@ | test.ps1:29:6:29:16 | Source | Source |
-| test.ps1:25:14:25:16 | _ | test.ps1:30:6:30:16 | Source | test.ps1:25:14:25:16 | _ | $@ | test.ps1:30:6:30:16 | Source | Source |
-| test.ps1:36:10:36:12 | x | test.ps1:39:6:39:16 | Source | test.ps1:36:10:36:12 | x | $@ | test.ps1:39:6:39:16 | Source | Source |
-| test.ps1:46:14:46:16 | x | test.ps1:50:23:50:33 | Source | test.ps1:46:14:46:16 | x | $@ | test.ps1:50:23:50:33 | Source | Source |
-| test.ps1:46:14:46:16 | x | test.ps1:50:58:50:69 | Source | test.ps1:46:14:46:16 | x | $@ | test.ps1:50:58:50:69 | Source | Source |
-| test.ps1:46:14:46:16 | x | test.ps1:50:94:50:105 | Source | test.ps1:46:14:46:16 | x | $@ | test.ps1:50:94:50:105 | Source | Source |
+| test.ps1:13:14:13:16 | x | test.ps1:2:10:2:20 | call to Source | test.ps1:13:14:13:16 | x | $@ | test.ps1:2:10:2:20 | call to Source | call to Source |
+| test.ps1:13:14:13:16 | x | test.ps1:3:10:3:20 | call to Source | test.ps1:13:14:13:16 | x | $@ | test.ps1:3:10:3:20 | call to Source | call to Source |
+| test.ps1:13:14:13:16 | x | test.ps1:4:10:4:20 | call to Source | test.ps1:13:14:13:16 | x | $@ | test.ps1:4:10:4:20 | call to Source | call to Source |
+| test.ps1:13:14:13:16 | x | test.ps1:19:6:19:16 | call to Source | test.ps1:13:14:13:16 | x | $@ | test.ps1:19:6:19:16 | call to Source | call to Source |
+| test.ps1:13:14:13:16 | x | test.ps1:20:6:20:16 | call to Source | test.ps1:13:14:13:16 | x | $@ | test.ps1:20:6:20:16 | call to Source | call to Source |
+| test.ps1:25:14:25:16 | _ | test.ps1:29:6:29:16 | call to Source | test.ps1:25:14:25:16 | _ | $@ | test.ps1:29:6:29:16 | call to Source | call to Source |
+| test.ps1:25:14:25:16 | _ | test.ps1:30:6:30:16 | call to Source | test.ps1:25:14:25:16 | _ | $@ | test.ps1:30:6:30:16 | call to Source | call to Source |
+| test.ps1:36:10:36:12 | x | test.ps1:39:6:39:16 | call to Source | test.ps1:36:10:36:12 | x | $@ | test.ps1:39:6:39:16 | call to Source | call to Source |
+| test.ps1:46:14:46:16 | x | test.ps1:50:23:50:33 | call to Source | test.ps1:46:14:46:16 | x | $@ | test.ps1:50:23:50:33 | call to Source | call to Source |
+| test.ps1:46:14:46:16 | x | test.ps1:50:58:50:69 | call to Source | test.ps1:46:14:46:16 | x | $@ | test.ps1:50:58:50:69 | call to Source | call to Source |
+| test.ps1:46:14:46:16 | x | test.ps1:50:94:50:105 | call to Source | test.ps1:46:14:46:16 | x | $@ | test.ps1:50:94:50:105 | call to Source | call to Source |
diff --git a/powershell/ql/test/library-tests/dataflow/returns/test.expected b/powershell/ql/test/library-tests/dataflow/returns/test.expected
index 4f0f84b5762..3fe33326ac7 100644
--- a/powershell/ql/test/library-tests/dataflow/returns/test.expected
+++ b/powershell/ql/test/library-tests/dataflow/returns/test.expected
@@ -1,53 +1,53 @@
 models
 edges
-| test.ps1:2:5:2:15 | Source | test.ps1:5:6:5:20 | callSourceOnce | provenance |  |
-| test.ps1:5:6:5:20 | callSourceOnce | test.ps1:6:6:6:8 | x | provenance |  |
-| test.ps1:9:5:9:15 | Source | test.ps1:13:6:13:21 | callSourceTwice [element] | provenance |  |
-| test.ps1:10:5:10:15 | Source | test.ps1:13:6:13:21 | callSourceTwice [element] | provenance |  |
-| test.ps1:13:6:13:21 | callSourceTwice [element] | test.ps1:15:6:15:8 | x [element] | provenance |  |
-| test.ps1:13:6:13:21 | callSourceTwice [element] | test.ps1:16:6:16:8 | x [element] | provenance |  |
+| test.ps1:2:5:2:15 | call to Source | test.ps1:5:6:5:20 | call to callSourceOnce | provenance |  |
+| test.ps1:5:6:5:20 | call to callSourceOnce | test.ps1:6:6:6:8 | x | provenance |  |
+| test.ps1:9:5:9:15 | call to Source | test.ps1:13:6:13:21 | call to callSourceTwice [element] | provenance |  |
+| test.ps1:10:5:10:15 | call to Source | test.ps1:13:6:13:21 | call to callSourceTwice [element] | provenance |  |
+| test.ps1:13:6:13:21 | call to callSourceTwice [element] | test.ps1:15:6:15:8 | x [element] | provenance |  |
+| test.ps1:13:6:13:21 | call to callSourceTwice [element] | test.ps1:16:6:16:8 | x [element] | provenance |  |
 | test.ps1:15:6:15:8 | x [element] | test.ps1:15:6:15:11 | ...[...] | provenance |  |
 | test.ps1:16:6:16:8 | x [element] | test.ps1:16:6:16:11 | ...[...] | provenance |  |
-| test.ps1:19:12:19:22 | Source | test.ps1:22:6:22:19 | returnSource1 | provenance |  |
-| test.ps1:22:6:22:19 | returnSource1 | test.ps1:23:6:23:8 | x | provenance |  |
-| test.ps1:26:10:26:20 | Source | test.ps1:27:5:27:7 | x | provenance |  |
-| test.ps1:27:5:27:7 | x | test.ps1:32:6:32:19 | returnSource2 [element] | provenance |  |
-| test.ps1:28:10:28:20 | Source | test.ps1:29:12:29:14 | y | provenance |  |
-| test.ps1:29:12:29:14 | y | test.ps1:32:6:32:19 | returnSource2 [element] | provenance |  |
-| test.ps1:32:6:32:19 | returnSource2 [element] | test.ps1:33:6:33:8 | x [element] | provenance |  |
-| test.ps1:32:6:32:19 | returnSource2 [element] | test.ps1:34:6:34:8 | x [element] | provenance |  |
+| test.ps1:19:12:19:22 | call to Source | test.ps1:22:6:22:19 | call to returnSource1 | provenance |  |
+| test.ps1:22:6:22:19 | call to returnSource1 | test.ps1:23:6:23:8 | x | provenance |  |
+| test.ps1:26:10:26:20 | call to Source | test.ps1:27:5:27:7 | x | provenance |  |
+| test.ps1:27:5:27:7 | x | test.ps1:32:6:32:19 | call to returnSource2 [element] | provenance |  |
+| test.ps1:28:10:28:20 | call to Source | test.ps1:29:12:29:14 | y | provenance |  |
+| test.ps1:29:12:29:14 | y | test.ps1:32:6:32:19 | call to returnSource2 [element] | provenance |  |
+| test.ps1:32:6:32:19 | call to returnSource2 [element] | test.ps1:33:6:33:8 | x [element] | provenance |  |
+| test.ps1:32:6:32:19 | call to returnSource2 [element] | test.ps1:34:6:34:8 | x [element] | provenance |  |
 | test.ps1:33:6:33:8 | x [element] | test.ps1:33:6:33:11 | ...[...] | provenance |  |
 | test.ps1:34:6:34:8 | x [element] | test.ps1:34:6:34:11 | ...[...] | provenance |  |
-| test.ps1:38:9:38:19 | Source | test.ps1:42:6:42:22 | callSourceInLoop [element] | provenance |  |
-| test.ps1:42:6:42:22 | callSourceInLoop [element] | test.ps1:43:6:43:8 | x [element] | provenance |  |
-| test.ps1:42:6:42:22 | callSourceInLoop [element] | test.ps1:44:6:44:8 | x [element] | provenance |  |
+| test.ps1:38:9:38:19 | call to Source | test.ps1:42:6:42:22 | call to callSourceInLoop [element] | provenance |  |
+| test.ps1:42:6:42:22 | call to callSourceInLoop [element] | test.ps1:43:6:43:8 | x [element] | provenance |  |
+| test.ps1:42:6:42:22 | call to callSourceInLoop [element] | test.ps1:44:6:44:8 | x [element] | provenance |  |
 | test.ps1:43:6:43:8 | x [element] | test.ps1:43:6:43:11 | ...[...] | provenance |  |
 | test.ps1:44:6:44:8 | x [element] | test.ps1:44:6:44:11 | ...[...] | provenance |  |
 nodes
-| test.ps1:2:5:2:15 | Source | semmle.label | Source |
-| test.ps1:5:6:5:20 | callSourceOnce | semmle.label | callSourceOnce |
+| test.ps1:2:5:2:15 | call to Source | semmle.label | call to Source |
+| test.ps1:5:6:5:20 | call to callSourceOnce | semmle.label | call to callSourceOnce |
 | test.ps1:6:6:6:8 | x | semmle.label | x |
-| test.ps1:9:5:9:15 | Source | semmle.label | Source |
-| test.ps1:10:5:10:15 | Source | semmle.label | Source |
-| test.ps1:13:6:13:21 | callSourceTwice [element] | semmle.label | callSourceTwice [element] |
+| test.ps1:9:5:9:15 | call to Source | semmle.label | call to Source |
+| test.ps1:10:5:10:15 | call to Source | semmle.label | call to Source |
+| test.ps1:13:6:13:21 | call to callSourceTwice [element] | semmle.label | call to callSourceTwice [element] |
 | test.ps1:15:6:15:8 | x [element] | semmle.label | x [element] |
 | test.ps1:15:6:15:11 | ...[...] | semmle.label | ...[...] |
 | test.ps1:16:6:16:8 | x [element] | semmle.label | x [element] |
 | test.ps1:16:6:16:11 | ...[...] | semmle.label | ...[...] |
-| test.ps1:19:12:19:22 | Source | semmle.label | Source |
-| test.ps1:22:6:22:19 | returnSource1 | semmle.label | returnSource1 |
+| test.ps1:19:12:19:22 | call to Source | semmle.label | call to Source |
+| test.ps1:22:6:22:19 | call to returnSource1 | semmle.label | call to returnSource1 |
 | test.ps1:23:6:23:8 | x | semmle.label | x |
-| test.ps1:26:10:26:20 | Source | semmle.label | Source |
+| test.ps1:26:10:26:20 | call to Source | semmle.label | call to Source |
 | test.ps1:27:5:27:7 | x | semmle.label | x |
-| test.ps1:28:10:28:20 | Source | semmle.label | Source |
+| test.ps1:28:10:28:20 | call to Source | semmle.label | call to Source |
 | test.ps1:29:12:29:14 | y | semmle.label | y |
-| test.ps1:32:6:32:19 | returnSource2 [element] | semmle.label | returnSource2 [element] |
+| test.ps1:32:6:32:19 | call to returnSource2 [element] | semmle.label | call to returnSource2 [element] |
 | test.ps1:33:6:33:8 | x [element] | semmle.label | x [element] |
 | test.ps1:33:6:33:11 | ...[...] | semmle.label | ...[...] |
 | test.ps1:34:6:34:8 | x [element] | semmle.label | x [element] |
 | test.ps1:34:6:34:11 | ...[...] | semmle.label | ...[...] |
-| test.ps1:38:9:38:19 | Source | semmle.label | Source |
-| test.ps1:42:6:42:22 | callSourceInLoop [element] | semmle.label | callSourceInLoop [element] |
+| test.ps1:38:9:38:19 | call to Source | semmle.label | call to Source |
+| test.ps1:42:6:42:22 | call to callSourceInLoop [element] | semmle.label | call to callSourceInLoop [element] |
 | test.ps1:43:6:43:8 | x [element] | semmle.label | x [element] |
 | test.ps1:43:6:43:11 | ...[...] | semmle.label | ...[...] |
 | test.ps1:44:6:44:8 | x [element] | semmle.label | x [element] |
@@ -55,15 +55,15 @@ nodes
 subpaths
 testFailures
 #select
-| test.ps1:6:6:6:8 | x | test.ps1:2:5:2:15 | Source | test.ps1:6:6:6:8 | x | $@ | test.ps1:2:5:2:15 | Source | Source |
-| test.ps1:15:6:15:11 | ...[...] | test.ps1:9:5:9:15 | Source | test.ps1:15:6:15:11 | ...[...] | $@ | test.ps1:9:5:9:15 | Source | Source |
-| test.ps1:15:6:15:11 | ...[...] | test.ps1:10:5:10:15 | Source | test.ps1:15:6:15:11 | ...[...] | $@ | test.ps1:10:5:10:15 | Source | Source |
-| test.ps1:16:6:16:11 | ...[...] | test.ps1:9:5:9:15 | Source | test.ps1:16:6:16:11 | ...[...] | $@ | test.ps1:9:5:9:15 | Source | Source |
-| test.ps1:16:6:16:11 | ...[...] | test.ps1:10:5:10:15 | Source | test.ps1:16:6:16:11 | ...[...] | $@ | test.ps1:10:5:10:15 | Source | Source |
-| test.ps1:23:6:23:8 | x | test.ps1:19:12:19:22 | Source | test.ps1:23:6:23:8 | x | $@ | test.ps1:19:12:19:22 | Source | Source |
-| test.ps1:33:6:33:11 | ...[...] | test.ps1:26:10:26:20 | Source | test.ps1:33:6:33:11 | ...[...] | $@ | test.ps1:26:10:26:20 | Source | Source |
-| test.ps1:33:6:33:11 | ...[...] | test.ps1:28:10:28:20 | Source | test.ps1:33:6:33:11 | ...[...] | $@ | test.ps1:28:10:28:20 | Source | Source |
-| test.ps1:34:6:34:11 | ...[...] | test.ps1:26:10:26:20 | Source | test.ps1:34:6:34:11 | ...[...] | $@ | test.ps1:26:10:26:20 | Source | Source |
-| test.ps1:34:6:34:11 | ...[...] | test.ps1:28:10:28:20 | Source | test.ps1:34:6:34:11 | ...[...] | $@ | test.ps1:28:10:28:20 | Source | Source |
-| test.ps1:43:6:43:11 | ...[...] | test.ps1:38:9:38:19 | Source | test.ps1:43:6:43:11 | ...[...] | $@ | test.ps1:38:9:38:19 | Source | Source |
-| test.ps1:44:6:44:11 | ...[...] | test.ps1:38:9:38:19 | Source | test.ps1:44:6:44:11 | ...[...] | $@ | test.ps1:38:9:38:19 | Source | Source |
+| test.ps1:6:6:6:8 | x | test.ps1:2:5:2:15 | call to Source | test.ps1:6:6:6:8 | x | $@ | test.ps1:2:5:2:15 | call to Source | call to Source |
+| test.ps1:15:6:15:11 | ...[...] | test.ps1:9:5:9:15 | call to Source | test.ps1:15:6:15:11 | ...[...] | $@ | test.ps1:9:5:9:15 | call to Source | call to Source |
+| test.ps1:15:6:15:11 | ...[...] | test.ps1:10:5:10:15 | call to Source | test.ps1:15:6:15:11 | ...[...] | $@ | test.ps1:10:5:10:15 | call to Source | call to Source |
+| test.ps1:16:6:16:11 | ...[...] | test.ps1:9:5:9:15 | call to Source | test.ps1:16:6:16:11 | ...[...] | $@ | test.ps1:9:5:9:15 | call to Source | call to Source |
+| test.ps1:16:6:16:11 | ...[...] | test.ps1:10:5:10:15 | call to Source | test.ps1:16:6:16:11 | ...[...] | $@ | test.ps1:10:5:10:15 | call to Source | call to Source |
+| test.ps1:23:6:23:8 | x | test.ps1:19:12:19:22 | call to Source | test.ps1:23:6:23:8 | x | $@ | test.ps1:19:12:19:22 | call to Source | call to Source |
+| test.ps1:33:6:33:11 | ...[...] | test.ps1:26:10:26:20 | call to Source | test.ps1:33:6:33:11 | ...[...] | $@ | test.ps1:26:10:26:20 | call to Source | call to Source |
+| test.ps1:33:6:33:11 | ...[...] | test.ps1:28:10:28:20 | call to Source | test.ps1:33:6:33:11 | ...[...] | $@ | test.ps1:28:10:28:20 | call to Source | call to Source |
+| test.ps1:34:6:34:11 | ...[...] | test.ps1:26:10:26:20 | call to Source | test.ps1:34:6:34:11 | ...[...] | $@ | test.ps1:26:10:26:20 | call to Source | call to Source |
+| test.ps1:34:6:34:11 | ...[...] | test.ps1:28:10:28:20 | call to Source | test.ps1:34:6:34:11 | ...[...] | $@ | test.ps1:28:10:28:20 | call to Source | call to Source |
+| test.ps1:43:6:43:11 | ...[...] | test.ps1:38:9:38:19 | call to Source | test.ps1:43:6:43:11 | ...[...] | $@ | test.ps1:38:9:38:19 | call to Source | call to Source |
+| test.ps1:44:6:44:11 | ...[...] | test.ps1:38:9:38:19 | call to Source | test.ps1:44:6:44:11 | ...[...] | $@ | test.ps1:38:9:38:19 | call to Source | call to Source |
diff --git a/powershell/ql/test/qlpack.yml b/powershell/ql/test/qlpack.yml
index ccd69e233fe..b9e644ea2c3 100644
--- a/powershell/ql/test/qlpack.yml
+++ b/powershell/ql/test/qlpack.yml
@@ -4,6 +4,7 @@ groups:
   - test
 dependencies:
   microsoft-sdl/powershell-all: ${workspace}
+  microsoft-sdl/powershell-queries: ${workspace}
 extractor: powershell
 tests: .
 warnOnImplicitThis: true
\ No newline at end of file
diff --git a/powershell/ql/test/query-tests/security/cwe-078/CommandInjection/CommandInjection.expected b/powershell/ql/test/query-tests/security/cwe-078/CommandInjection/CommandInjection.expected
new file mode 100644
index 00000000000..53e66a64f68
--- /dev/null
+++ b/powershell/ql/test/query-tests/security/cwe-078/CommandInjection/CommandInjection.expected
@@ -0,0 +1,12 @@
+edges
+| test.ps1:1:8:1:10 | x | test.ps1:3:28:3:48 | Get-Process -Id $x | provenance |  |
+| test.ps1:5:10:5:21 | Env:MY_VAR | test.ps1:7:3:7:20 | $code --enabled | provenance |  |
+nodes
+| test.ps1:1:8:1:10 | x | semmle.label | x |
+| test.ps1:3:28:3:48 | Get-Process -Id $x | semmle.label | Get-Process -Id $x |
+| test.ps1:5:10:5:21 | Env:MY_VAR | semmle.label | Env:MY_VAR |
+| test.ps1:7:3:7:20 | $code --enabled | semmle.label | $code --enabled |
+subpaths
+#select
+| test.ps1:3:28:3:48 | Get-Process -Id $x | test.ps1:1:8:1:10 | x | test.ps1:3:28:3:48 | Get-Process -Id $x | This command depends on a $@. | test.ps1:1:8:1:10 | x | user-provided value |
+| test.ps1:7:3:7:20 | $code --enabled | test.ps1:5:10:5:21 | Env:MY_VAR | test.ps1:7:3:7:20 | $code --enabled | This command depends on a $@. | test.ps1:5:10:5:21 | Env:MY_VAR | user-provided value |
diff --git a/powershell/ql/test/query-tests/security/cwe-078/CommandInjection/CommandInjection.qlref b/powershell/ql/test/query-tests/security/cwe-078/CommandInjection/CommandInjection.qlref
new file mode 100644
index 00000000000..06653bc5ac7
--- /dev/null
+++ b/powershell/ql/test/query-tests/security/cwe-078/CommandInjection/CommandInjection.qlref
@@ -0,0 +1 @@
+queries/security/cwe-078/CommandInjection.ql
\ No newline at end of file
diff --git a/powershell/ql/test/query-tests/security/cwe-078/CommandInjection/test.ps1 b/powershell/ql/test/query-tests/security/cwe-078/CommandInjection/test.ps1
new file mode 100644
index 00000000000..682b1af3752
--- /dev/null
+++ b/powershell/ql/test/query-tests/security/cwe-078/CommandInjection/test.ps1
@@ -0,0 +1,7 @@
+param ($x)
+
+Invoke-Expression -Command "Get-Process -Id $x" # BAD
+
+$code = "$Env:MY_VAR"
+
+& "$code --enabled" # BAD
\ No newline at end of file
diff --git a/powershell/tools/qltest.cmd b/powershell/tools/qltest.cmd
index 0f129800d4b..402978322d6 100644
--- a/powershell/tools/qltest.cmd
+++ b/powershell/tools/qltest.cmd
@@ -6,6 +6,7 @@ type NUL && "%CODEQL_DIST%\codeql.exe" database index-files ^
     --size-limit=5m ^
     --language=powershell ^
     --working-dir=. ^
+    --extractor-option="powershell.skip_psmodulepath_files=true" ^
     "%CODEQL_EXTRACTOR_POWERSHELL_WIP_DATABASE%"
 
 exit /b %ERRORLEVEL%
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/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/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/util.py b/python/extractor/semmle/util.py
index 41af1d497b3..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 = "7.0.0"
+VERSION = "7.1.1"
 
 PY_EXTENSIONS = ".py", ".pyw"
 
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/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/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 c1f3765162e..1e05822734d 100644
--- a/python/ql/lib/CHANGELOG.md
+++ b/python/ql/lib/CHANGELOG.md
@@ -1,3 +1,10 @@
+## 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
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 576c2ea18d6..1a4e53e8772 100644
--- a/python/ql/lib/codeql-pack.release.yml
+++ b/python/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 2.1.1
+lastReleaseVersion: 2.1.2
diff --git a/python/ql/lib/qlpack.yml b/python/ql/lib/qlpack.yml
index dd92c1068da..8ca2a4b2a75 100644
--- a/python/ql/lib/qlpack.yml
+++ b/python/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/python-all
-version: 2.1.1
+version: 2.1.2
 groups: python
 dbscheme: semmlecode.python.dbscheme
 extractor: python
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/dataflow/new/internal/DataFlowImpl1.qll b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl1.qll
index ce964917e97..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) {
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 ce964917e97..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) {
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 ce964917e97..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) {
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 ce964917e97..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) {
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 085eed843ef..ffecbcba57a 100644
--- a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowPublic.qll
+++ b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowPublic.qll
@@ -687,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. */
@@ -709,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. */
@@ -721,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. */
@@ -738,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. */
@@ -750,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/TaintTrackingPrivate.qll b/python/ql/lib/semmle/python/dataflow/new/internal/TaintTrackingPrivate.qll
index fb46f7d6892..62f5a76309b 100644
--- a/python/ql/lib/semmle/python/dataflow/new/internal/TaintTrackingPrivate.qll
+++ b/python/ql/lib/semmle/python/dataflow/new/internal/TaintTrackingPrivate.qll
@@ -219,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/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/Stdlib.model.yml b/python/ql/lib/semmle/python/frameworks/Stdlib.model.yml
index 2969fbfb1ae..cdbb451b673 100644
--- a/python/ql/lib/semmle/python/frameworks/Stdlib.model.yml
+++ b/python/ql/lib/semmle/python/frameworks/Stdlib.model.yml
@@ -45,7 +45,7 @@ extensions:
       # 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]", "Argument[0,x:]", "ReturnValue", "value"]
+      - ["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
diff --git a/python/ql/lib/semmle/python/frameworks/Stdlib.qll b/python/ql/lib/semmle/python/frameworks/Stdlib.qll
index 2bec246bfc0..45878c8160b 100644
--- a/python/ql/lib/semmle/python/frameworks/Stdlib.qll
+++ b/python/ql/lib/semmle/python/frameworks/Stdlib.qll
@@ -4537,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
@@ -4561,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
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 ea236eb11ba..64a33ed30ca 100644
--- a/python/ql/src/CHANGELOG.md
+++ b/python/ql/src/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 1.3.2
+
+### Minor Analysis Improvements
+
+* Improved modelling for the `pycurl` framework.
+
 ## 1.3.1
 
 No user-facing changes.
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.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 e71b6d081f1..86a9cb32d86 100644
--- a/python/ql/src/codeql-pack.release.yml
+++ b/python/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.3.1
+lastReleaseVersion: 1.3.2
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 52d6ee0b603..0dcc599246b 100644
--- a/python/ql/src/qlpack.yml
+++ b/python/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/python-queries
-version: 1.3.1
+version: 1.3.2
 groups:
   - python
   - queries
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 e1b14363639..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 {
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/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 8f2ca113e3c..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,6 +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__ |
+| 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/tainttracking/defaultAdditionalTaintStep/test_collections.py b/python/ql/test/library-tests/dataflow/tainttracking/defaultAdditionalTaintStep/test_collections.py
index e7ae9b41eda..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
@@ -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/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-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/ruby/ql/lib/CHANGELOG.md b/ruby/ql/lib/CHANGELOG.md
index fcfaf0238c2..230f81c621b 100644
--- a/ruby/ql/lib/CHANGELOG.md
+++ b/ruby/ql/lib/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.0.3
+
+No user-facing changes.
+
 ## 2.0.2
 
 ### Minor Analysis Improvements
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 81c7f1dbc13..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.2
+lastReleaseVersion: 2.0.3
diff --git a/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImpl1.qll b/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImpl1.qll
index ce964917e97..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) {
diff --git a/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImpl2.qll b/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImpl2.qll
index ce964917e97..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) {
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 53ea89afe3b..a584547b226 100644
--- a/ruby/ql/lib/qlpack.yml
+++ b/ruby/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/ruby-all
-version: 2.0.2
+version: 2.0.3
 groups: ruby
 extractor: ruby
 dbscheme: ruby.dbscheme
diff --git a/ruby/ql/src/CHANGELOG.md b/ruby/ql/src/CHANGELOG.md
index 363b517dec1..3dfaa623d60 100644
--- a/ruby/ql/src/CHANGELOG.md
+++ b/ruby/ql/src/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.1.6
+
+No user-facing changes.
+
 ## 1.1.5
 
 ### Minor Analysis Improvements
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 df39a9de059..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.5
+lastReleaseVersion: 1.1.6
diff --git a/ruby/ql/src/qlpack.yml b/ruby/ql/src/qlpack.yml
index 2c0ea256429..02e882e9f9d 100644
--- a/ruby/ql/src/qlpack.yml
+++ b/ruby/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/ruby-queries
-version: 1.1.5
+version: 1.1.6
 groups:
   - ruby
   - queries
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/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 34093c8b8cd..95bac1978fb 100644
--- a/ruby/ql/test/library-tests/dataflow/flow-summaries/semantics.expected
+++ b/ruby/ql/test/library-tests/dataflow/flow-summaries/semantics.expected
@@ -458,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 |  |
@@ -538,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 |  |
@@ -546,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 |  |
@@ -1616,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] |
@@ -1634,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] |
@@ -1708,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/frameworks/action_controller/params-flow.expected b/ruby/ql/test/library-tests/frameworks/action_controller/params-flow.expected
index 73f4ab1f46d..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
@@ -270,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/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/rust/ast-generator/src/main.rs b/rust/ast-generator/src/main.rs
index 5f29fa424f7..665ffbac6c7 100644
--- a/rust/ast-generator/src/main.rs
+++ b/rust/ast-generator/src/main.rs
@@ -440,7 +440,8 @@ fn write_extractor(grammar: &AstSrc) -> std::io::Result<String> {
         "//! Generated by `ast-generator`, do not edit by hand.\n
 #![cfg_attr(any(), rustfmt::skip)]
 
-use super::base::{{TextValue, Translator}};
+use super::base::Translator;
+use super::mappings::TextValue;
 use crate::emit_detached;
 use crate::generated;
 use crate::trap::{{Label, TrapId}};
diff --git a/rust/codegen/BUILD.bazel b/rust/codegen/BUILD.bazel
index 43e057a6fbf..ba9f2565b70 100644
--- a/rust/codegen/BUILD.bazel
+++ b/rust/codegen/BUILD.bazel
@@ -1,3 +1,5 @@
+load("@bazel_skylib//rules:native_binary.bzl", "native_binary")
+
 _args = [
     "//rust/ast-generator",
     "//rust/ast-generator:manifest",
@@ -15,3 +17,16 @@ sh_binary(
         "//misc/bazel:sh_runfiles",
     ],
 )
+
+native_binary(
+    name = "py",
+    src = "//misc/codegen",
+    out = "codegen",
+    args = [
+        "--configuration-file=$(location //rust:codegen-conf)",
+    ],
+    data = [
+        "//rust:codegen-conf",
+    ],
+    visibility = ["//rust:__subpackages__"],
+)
diff --git a/rust/codegen/codegen.sh b/rust/codegen/codegen.sh
index cb15c796fd6..0d746eeb289 100755
--- a/rust/codegen/codegen.sh
+++ b/rust/codegen/codegen.sh
@@ -8,6 +8,7 @@ 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"
+"$codegen" --configuration-file="$codegen_conf" "$@"
diff --git a/rust/extractor/Cargo.toml b/rust/extractor/Cargo.toml
index 2a711291258..2cb4e70fc7d 100644
--- a/rust/extractor/Cargo.toml
+++ b/rust/extractor/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2021"
 [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"
@@ -29,3 +29,4 @@ 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/src/lib.rs b/rust/extractor/macros/src/lib.rs
index 781d53bd851..37ca22cda44 100644
--- a/rust/extractor/macros/src/lib.rs
+++ b/rust/extractor/macros/src/lib.rs
@@ -6,8 +6,8 @@ use quote::{format_ident, quote};
 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 cli_name = format_ident!("Cli{}", name);
+    let cli_fields = ast
         .fields
         .iter()
         .map(|f| {
@@ -39,17 +39,42 @@ pub fn extractor_cli_config(_attr: TokenStream, item: TokenStream) -> TokenStrea
                 }
             }
         })
-        .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)]
+        #[derive(Deserialize, Default)]
         #ast
 
+        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/config.rs b/rust/extractor/src/config.rs
index 0625968a4af..a9c27199e37 100644
--- a/rust/extractor/src/config.rs
+++ b/rust/extractor/src/config.rs
@@ -2,12 +2,15 @@ use anyhow::Context;
 use clap::Parser;
 use codeql_extractor::trap;
 use figment::{
-    providers::{Env, Serialized},
+    providers::{Env, Format, Serialized, Yaml},
+    value::Value,
     Figment,
 };
+use itertools::Itertools;
 use num_traits::Zero;
 use rust_extractor_macros::extractor_cli_config;
 use serde::{Deserialize, Serialize};
+use std::fmt::Debug;
 use std::ops::Not;
 use std::path::PathBuf;
 
@@ -38,6 +41,8 @@ pub struct Config {
     pub verbose: u8,
     pub compression: Compression,
     pub inputs: Vec<PathBuf>,
+    pub qltest: bool,
+    pub qltest_cargo_check: bool,
 }
 
 impl Config {
@@ -45,12 +50,25 @@ 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()
+        let mut figment = Figment::new()
             .merge(Env::prefixed("CODEQL_"))
             .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"))
+                .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")
     }
 }
diff --git a/rust/extractor/src/generated/.generated.list b/rust/extractor/src/generated/.generated.list
index f9c6aa0afef..d6b6eac35e8 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 29bca54c5bf58ebc5bcc1d17de53c3fa23080c403c52e25be4a3c9dcafd26622 29bca54c5bf58ebc5bcc1d17de53c3fa23080c403c52e25be4a3c9dcafd26622
+top.rs 60b0821a7535361e4f0dd280d654c4d8167fca919bda082b17f91ff9878788a5 60b0821a7535361e4f0dd280d654c4d8167fca919bda082b17f91ff9878788a5
diff --git a/rust/extractor/src/generated/top.rs b/rust/extractor/src/generated/top.rs
index 6e280593a0b..8fa8cac061d 100644
--- a/rust/extractor/src/generated/top.rs
+++ b/rust/extractor/src/generated/top.rs
@@ -390,6 +390,42 @@ impl From<trap::Label<Attr>> for trap::Label<Locatable> {
     }
 }
 
+#[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>,
@@ -3873,6 +3909,7 @@ impl From<trap::Label<CastExpr>> for trap::Label<Locatable> {
 #[derive(Debug)]
 pub struct ClosureExpr {
     pub id: trap::TrapId<ClosureExpr>,
+    pub param_list: Option<trap::Label<ParamList>>,
     pub attrs: Vec<trap::Label<Attr>>,
     pub body: Option<trap::Label<Expr>>,
     pub closure_binder: Option<trap::Label<ClosureBinder>>,
@@ -3881,7 +3918,6 @@ pub struct ClosureExpr {
     pub is_gen: bool,
     pub is_move: bool,
     pub is_static: bool,
-    pub param_list: Option<trap::Label<ParamList>>,
     pub ret_type: Option<trap::Label<RetType>>,
 }
 
@@ -3892,8 +3928,11 @@ impl trap::TrapEntry for ClosureExpr {
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
         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.attrs.into_iter().enumerate() {
-            out.add_tuple("closure_expr_attrs", vec![id.into(), i.into(), v.into()]);
+            out.add_tuple("callable_attrs", vec![id.into(), i.into(), v.into()]);
         }
         if let Some(v) = self.body {
             out.add_tuple("closure_expr_bodies", vec![id.into(), v.into()]);
@@ -3916,9 +3955,6 @@ impl trap::TrapEntry for ClosureExpr {
         if self.is_static {
             out.add_tuple("closure_expr_is_static", vec![id.into()]);
         }
-        if let Some(v) = self.param_list {
-            out.add_tuple("closure_expr_param_lists", vec![id.into(), v.into()]);
-        }
         if let Some(v) = self.ret_type {
             out.add_tuple("closure_expr_ret_types", vec![id.into(), v.into()]);
         }
@@ -3938,6 +3974,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
@@ -5083,6 +5128,15 @@ 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" }
 }
@@ -6187,62 +6241,44 @@ impl From<trap::Label<ParenType>> for trap::Label<TypeRef> {
 }
 
 #[derive(Debug)]
-pub struct PathExpr {
-    pub id: trap::TrapId<PathExpr>,
-    pub attrs: Vec<trap::Label<Attr>>,
-    pub path: Option<trap::Label<Path>>,
+pub struct PathExprBase {
+    _unused: ()
 }
 
-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 PathExprBase {
+    fn class_name() -> &'static str { "PathExprBase" }
 }
 
-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
+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<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<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<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<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<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<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())
         }
@@ -8504,8 +8540,9 @@ impl From<trap::Label<ExternCrate>> for trap::Label<Stmt> {
 #[derive(Debug)]
 pub struct Function {
     pub id: trap::TrapId<Function>,
-    pub abi: Option<trap::Label<Abi>>,
+    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,
@@ -8514,7 +8551,6 @@ pub struct Function {
     pub is_gen: bool,
     pub is_unsafe: bool,
     pub name: Option<trap::Label<Name>>,
-    pub param_list: Option<trap::Label<ParamList>>,
     pub ret_type: Option<trap::Label<RetType>>,
     pub visibility: Option<trap::Label<Visibility>>,
     pub where_clause: Option<trap::Label<WhereClause>>,
@@ -8527,11 +8563,14 @@ impl trap::TrapEntry for Function {
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
         out.add_tuple("functions", vec![id.into()]);
-        if let Some(v) = self.abi {
-            out.add_tuple("function_abis", vec![id.into(), v.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("function_attrs", vec![id.into(), i.into(), v.into()]);
+            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()]);
@@ -8557,9 +8596,6 @@ impl trap::TrapEntry for Function {
         if let Some(v) = self.name {
             out.add_tuple("function_names", vec![id.into(), v.into()]);
         }
-        if let Some(v) = self.param_list {
-            out.add_tuple("function_param_lists", vec![id.into(), v.into()]);
-        }
         if let Some(v) = self.ret_type {
             out.add_tuple("function_ret_types", vec![id.into(), v.into()]);
         }
@@ -8594,6 +8630,15 @@ impl From<trap::Label<Function>> for trap::Label<AstNode> {
     }
 }
 
+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
@@ -9171,6 +9216,78 @@ impl From<trap::Label<Module>> for trap::Label<Stmt> {
     }
 }
 
+#[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>,
diff --git a/rust/extractor/src/main.rs b/rust/extractor/src/main.rs
index adcb6f681ae..294c4734209 100644
--- a/rust/extractor/src/main.rs
+++ b/rust/extractor/src/main.rs
@@ -1,22 +1,24 @@
+use anyhow::Context;
+use archive::Archiver;
+use log::info;
+use ra_ap_hir::Semantics;
+use ra_ap_ide_db::line_index::{LineCol, LineIndex};
+use ra_ap_project_model::ProjectManifest;
+use rust_analyzer::{ParseResult, RustAnalyzer};
 use std::{
     collections::HashMap,
     path::{Path, PathBuf},
 };
-
-use anyhow::Context;
-use archive::Archiver;
-use ra_ap_ide_db::line_index::{LineCol, LineIndex};
-use ra_ap_project_model::ProjectManifest;
-use rust_analyzer::{ParseResult, RustAnalyzer};
 mod archive;
 mod config;
 pub mod generated;
+mod qltest;
 mod rust_analyzer;
 mod translate;
 pub mod trap;
 
 fn extract(
-    rust_analyzer: &mut rust_analyzer::RustAnalyzer,
+    rust_analyzer: &rust_analyzer::RustAnalyzer,
     archiver: &Archiver,
     traps: &trap::TrapFileProvider,
     file: &std::path::Path,
@@ -28,7 +30,6 @@ fn extract(
         text,
         errors,
         file_id,
-        semantics,
     } = rust_analyzer.parse(file);
     let line_index = LineIndex::new(text.as_ref());
     let display_path = file.to_string_lossy();
@@ -40,7 +41,7 @@ fn extract(
         label,
         line_index,
         file_id,
-        semantics,
+        file_id.and(rust_analyzer.semantics()),
     );
 
     for err in errors {
@@ -65,16 +66,21 @@ fn extract(
         )
     });
 }
+
 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(1 + cfg.verbose as usize)
+        .verbosity(2 + cfg.verbose as usize)
         .init()?;
+    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 files: Vec<PathBuf> = cfg
         .inputs
@@ -106,14 +112,20 @@ fn main() -> anyhow::Result<()> {
         if files.is_empty() {
             break;
         }
-        let mut rust_analyzer = RustAnalyzer::new(manifest, &cfg.scratch_dir);
-        for file in files {
-            extract(&mut rust_analyzer, &archiver, &traps, file);
+        if let Some((ref db, ref vfs)) = RustAnalyzer::load_workspace(manifest, &cfg.scratch_dir) {
+            let semantics = Semantics::new(db);
+            let rust_analyzer = RustAnalyzer::new(vfs, semantics);
+            for file in files {
+                extract(&rust_analyzer, &archiver, &traps, file);
+            }
+        } else {
+            for file in files {
+                extract(&RustAnalyzer::WithoutSemantics, &archiver, &traps, file);
+            }
         }
     }
-    let mut rust_analyzer = RustAnalyzer::WithoutDatabase();
     for file in other_files {
-        extract(&mut rust_analyzer, &archiver, &traps, file);
+        extract(&RustAnalyzer::WithoutSemantics, &archiver, &traps, file);
     }
 
     Ok(())
diff --git a/rust/extractor/src/qltest.rs b/rust/extractor/src/qltest.rs
new file mode 100644
index 00000000000..169e2c433c7
--- /dev/null
+++ b/rust/extractor/src/qltest.rs
@@ -0,0 +1,72 @@
+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() -> 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"
+"#,
+        );
+    }
+    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()?;
+    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
index 80c34658a64..652f1619919 100644
--- a/rust/extractor/src/rust_analyzer.rs
+++ b/rust/extractor/src/rust_analyzer.rs
@@ -1,7 +1,6 @@
 use itertools::Itertools;
-use log::info;
+use log::{debug, info};
 use ra_ap_base_db::SourceDatabase;
-use ra_ap_base_db::SourceDatabaseFileInputExt;
 use ra_ap_hir::Semantics;
 use ra_ap_ide_db::RootDatabase;
 use ra_ap_load_cargo::{load_workspace_at, LoadCargoConfig, ProcMacroServerChoice};
@@ -21,19 +20,24 @@ use ra_ap_vfs::VfsPath;
 use std::borrow::Cow;
 use std::path::{Path, PathBuf};
 use triomphe::Arc;
-pub enum RustAnalyzer {
-    WithDatabase { db: RootDatabase, vfs: Vfs },
-    WithoutDatabase(),
+pub enum RustAnalyzer<'a> {
+    WithSemantics {
+        vfs: &'a Vfs,
+        semantics: Semantics<'a, RootDatabase>,
+    },
+    WithoutSemantics,
 }
-pub struct ParseResult<'a> {
+pub struct ParseResult {
     pub ast: SourceFile,
     pub text: Arc<str>,
     pub errors: Vec<SyntaxError>,
     pub file_id: Option<EditionedFileId>,
-    pub semantics: Option<Semantics<'a, RootDatabase>>,
 }
-impl RustAnalyzer {
-    pub fn new(project: &ProjectManifest, scratch_dir: &Path) -> Self {
+impl<'a> RustAnalyzer<'a> {
+    pub fn load_workspace(
+        project: &ProjectManifest,
+        scratch_dir: &Path,
+    ) -> Option<(RootDatabase, Vfs)> {
         let config = CargoConfig {
             sysroot: Some(RustLibSource::Discover),
             target_dir: ra_ap_paths::Utf8PathBuf::from_path_buf(scratch_dir.to_path_buf())
@@ -50,14 +54,55 @@ impl RustAnalyzer {
         let manifest = project.manifest_path();
 
         match load_workspace_at(manifest.as_ref(), &config, &load_config, &progress) {
-            Ok((db, vfs, _macro_server)) => RustAnalyzer::WithDatabase { db, vfs },
+            Ok((db, vfs, _macro_server)) => Some((db, vfs)),
             Err(err) => {
                 log::error!("failed to load workspace for {}: {}", manifest, err);
-                RustAnalyzer::WithoutDatabase()
+                None
             }
         }
     }
-    pub fn parse(&mut self, path: &Path) -> ParseResult<'_> {
+    pub fn new(vfs: &'a Vfs, semantics: Semantics<'a, RootDatabase>) -> Self {
+        RustAnalyzer::WithSemantics { vfs, semantics }
+    }
+    pub fn semantics(&'a self) -> Option<&'a Semantics<'a, RootDatabase>> {
+        match self {
+            RustAnalyzer::WithSemantics { vfs: _, semantics } => Some(semantics),
+            RustAnalyzer::WithoutSemantics => None,
+        }
+    }
+    pub fn parse(&self, path: &Path) -> ParseResult {
+        if let RustAnalyzer::WithSemantics { vfs, semantics } = self {
+            if let Some(file_id) = 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))
+            {
+                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,
+                        file_id: Some(file_id),
+                    };
+                } else {
+                    log::debug!(
+                        "No text available for file_id '{:?}', falling back to loading file '{}' from disk.",
+                        file_id,
+                        path.to_string_lossy()
+                    )
+                }
+            }
+        }
         let mut errors = Vec::new();
         let input = match std::fs::read(path) {
             Ok(data) => data,
@@ -71,32 +116,6 @@ impl RustAnalyzer {
         };
         let (input, err) = from_utf8_lossy(&input);
 
-        if let RustAnalyzer::WithDatabase { vfs, db } = self {
-            if let Some(file_id) = 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))
-            {
-                db.set_file_text(file_id, &input);
-                let semantics = Semantics::new(db);
-
-                let file_id = EditionedFileId::current_edition(file_id);
-                let source_file = semantics.parse(file_id);
-                errors.extend(
-                    db.parse_errors(file_id)
-                        .into_iter()
-                        .flat_map(|x| x.to_vec()),
-                );
-                return ParseResult {
-                    ast: source_file,
-                    text: input.as_ref().into(),
-                    errors,
-                    file_id: Some(file_id),
-                    semantics: Some(semantics),
-                };
-            }
-        }
         let parse = ra_ap_syntax::ast::SourceFile::parse(&input, Edition::CURRENT);
         errors.extend(parse.errors());
         errors.extend(err);
@@ -105,7 +124,6 @@ impl RustAnalyzer {
             text: input.as_ref().into(),
             errors,
             file_id: None,
-            semantics: None,
         }
     }
 }
@@ -119,10 +137,21 @@ pub fn find_project_manifests(
         .map(|path| AbsPathBuf::assert_utf8(current.join(path)))
         .collect();
     let ret = ra_ap_project_model::ProjectManifest::discover_all(&abs_files);
-    info!(
-        "found manifests: {}",
-        ret.iter().map(|m| format!("{m}")).join(", ")
-    );
+    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>) {
diff --git a/rust/extractor/src/translate.rs b/rust/extractor/src/translate.rs
index cf8c9c67020..4e9cda3e2aa 100644
--- a/rust/extractor/src/translate.rs
+++ b/rust/extractor/src/translate.rs
@@ -1,4 +1,5 @@
 mod base;
 mod generated;
+mod mappings;
 
 pub use base::Translator;
diff --git a/rust/extractor/src/translate/base.rs b/rust/extractor/src/translate/base.rs
index 721e2f1a537..7233faccf85 100644
--- a/rust/extractor/src/translate/base.rs
+++ b/rust/extractor/src/translate/base.rs
@@ -1,17 +1,22 @@
+use super::mappings::{AddressableAst, AddressableHir};
 use crate::generated::MacroCall;
 use crate::generated::{self};
 use crate::trap::{DiagnosticSeverity, TrapFile, TrapId};
 use crate::trap::{Label, TrapClass};
 use codeql_extractor::trap::{self};
 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::Semantics;
+use ra_ap_hir::{Adt, ItemContainer, Module, 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::RangeItem;
+use ra_ap_syntax::ast::HasName;
 use ra_ap_syntax::{
     ast, AstNode, NodeOrToken, SyntaxElementChildren, SyntaxError, SyntaxNode, SyntaxToken,
     TextRange,
@@ -20,69 +25,37 @@ use ra_ap_syntax::{
 #[macro_export]
 macro_rules! emit_detached {
     (MacroCall, $self:ident, $node:ident, $label:ident) => {
-        $self.extract_macro_call_expanded(&$node, $label.into());
+        $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
     ($($_:tt)*) => {};
 }
 
-pub 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 struct Translator<'a> {
     pub trap: TrapFile,
     path: &'a str,
     label: trap::Label,
     line_index: LineIndex,
     file_id: Option<EditionedFileId>,
-    pub semantics: Option<Semantics<'a, RootDatabase>>,
+    pub semantics: Option<&'a Semantics<'a, RootDatabase>>,
 }
 
 impl<'a> Translator<'a> {
@@ -92,7 +65,7 @@ impl<'a> Translator<'a> {
         label: trap::Label,
         line_index: LineIndex,
         file_id: Option<EditionedFileId>,
-        semantics: Option<Semantics<'a, RootDatabase>>,
+        semantics: Option<&'a Semantics<'a, RootDatabase>>,
     ) -> Translator<'a> {
         Translator {
             trap,
@@ -142,7 +115,7 @@ impl<'a> Translator<'a> {
             self.trap.emit_location(self.label, label, start, end)
         } else {
             self.emit_diagnostic(
-                DiagnosticSeverity::Info,
+                DiagnosticSeverity::Debug,
                 "locations".to_owned(),
                 "missing location for AstNode".to_owned(),
                 "missing location for AstNode".to_owned(),
@@ -169,9 +142,9 @@ impl<'a> Translator<'a> {
     pub fn emit_diagnostic(
         &mut self,
         severity: DiagnosticSeverity,
-        error_tag: String,
-        error_message: String,
-        full_error_message: String,
+        tag: String,
+        message: String,
+        full_message: String,
         location: (LineCol, LineCol),
     ) {
         let (start, end) = location;
@@ -187,16 +160,13 @@ impl<'a> Translator<'a> {
             self.path,
             start.line + 1,
             start.col + 1,
-            &error_message
-        );
-        let location = self.trap.emit_location_label(self.label, start, end);
-        self.trap.emit_diagnostic(
-            severity,
-            error_tag,
-            error_message,
-            full_error_message,
-            location,
+            &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();
@@ -328,4 +298,118 @@ impl<'a> Translator<'a> {
             );
         }
     }
+    fn canonical_path_from_type(&self, ty: Type) -> Option<String> {
+        let sema = self.semantics.as_ref().unwrap();
+        // rust-analyzer doesn't provide a type enum directly
+        if let Some(it) = ty.as_adt() {
+            return match it {
+                Adt::Struct(it) => self.canonical_path_from_hir(it),
+                Adt::Union(it) => self.canonical_path_from_hir(it),
+                Adt::Enum(it) => self.canonical_path_from_hir(it),
+            };
+        };
+        if let Some((it, size)) = ty.as_array(sema.db) {
+            return self
+                .canonical_path_from_type(it)
+                .map(|p| format!("[{p}; {size}]"));
+        }
+        if let Some(it) = ty.as_slice() {
+            return self
+                .canonical_path_from_type(it)
+                .map(|p| format!("[{}]", p));
+        }
+        if let Some(it) = ty.as_builtin() {
+            return Some(it.name().as_str().to_owned());
+        }
+        if let Some(it) = ty.as_dyn_trait() {
+            return self.canonical_path_from_hir(it).map(|p| format!("dyn {p}"));
+        }
+        if let Some((it, mutability)) = ty.as_reference() {
+            let mut_str = match mutability {
+                Mutability::Shared => "",
+                Mutability::Mut => "mut ",
+            };
+            return self
+                .canonical_path_from_type(it)
+                .map(|p| format!("&{mut_str}{p}"));
+        }
+        if let Some(it) = ty.as_impl_traits(sema.db) {
+            let paths = it
+                .map(|t| self.canonical_path_from_hir(t))
+                .collect::<Option<Vec<_>>>()?;
+            return Some(format!("impl {}", paths.join(" + ")));
+        }
+        if ty.as_type_param(sema.db).is_some() {
+            // from the canonical path perspective, we just want a special name
+            // e.g. `crate::<_ as SomeTrait>::func`
+            return Some("_".to_owned());
+        }
+        None
+    }
+
+    fn canonical_path_from_hir_module(&self, item: Module) -> Option<String> {
+        if 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 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();
+        match item.module(sema).krate().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),
+        }
+    }
+
+    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(())
+        })();
+    }
 }
diff --git a/rust/extractor/src/translate/generated.rs b/rust/extractor/src/translate/generated.rs
index d548d26c290..aea607b753d 100644
--- a/rust/extractor/src/translate/generated.rs
+++ b/rust/extractor/src/translate/generated.rs
@@ -2,7 +2,8 @@
 
 #![cfg_attr(any(), rustfmt::skip)]
 
-use super::base::{TextValue, Translator};
+use super::base::Translator;
+use super::mappings::TextValue;
 use crate::emit_detached;
 use crate::generated;
 use crate::trap::{Label, TrapId};
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 ed75010fcae..58f56fb2b1e 100644
--- a/rust/extractor/src/trap.rs
+++ b/rust/extractor/src/trap.rs
@@ -128,7 +128,7 @@ pub struct TrapFile {
     compression: Compression,
 }
 
-#[derive(Copy, Clone)]
+#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord)]
 pub enum DiagnosticSeverity {
     Debug = 10,
     Info = 20,
diff --git a/rust/ql/.generated.list b/rust/ql/.generated.list
index 66650b80e75..c42ae033fc9 100644
--- a/rust/ql/.generated.list
+++ b/rust/ql/.generated.list
@@ -4,7 +4,7 @@ lib/codeql/rust/elements/ArrayExpr.qll a3e6e122632f4011644ec31b37f88b32fe3f2b7e3
 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 1eed81b9936157f106a98d737a90b95836874c0adb47997871b7d372b3d31c1d 9189da6f7fd601f88efa441a5c65ea00d3cdd30e36b6b65cc0b7a4059b61c834
+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/Attr.qll 53887a49513b95e38344b57d824a7474331467561f1edf38d5ca608d8cefa0cd 2e9eeb32ba6cc186691897979e30d32bc6eaff523e37064ee84cf09ded5afe17
@@ -16,9 +16,10 @@ lib/codeql/rust/elements/BoxPat.qll 1b2c3fff171aa6aa238c9460b122f26c79e04577cea6
 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 8f06357ae134e42c073eef994c83c04b8cf294fe33b286dbd75c0e705ce29d05 9d9e282d965fed723965376801d4afa49444d1d9be9b093d02e276729a2cf7ad
+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
@@ -39,9 +40,12 @@ lib/codeql/rust/elements/FieldList.qll bd243adc4696c60f636055a1c2da28039fe202847
 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/Function.qll 736c53408f8674c88c352cd1f08f7c77e51551c68ef802f2e1c1aaf3d44fa8e9 6b52dbea081a5e799f1a2cedd57be5485bc8e018ded7249a1852343053d849a6
+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
@@ -93,7 +97,8 @@ lib/codeql/rust/elements/ParenPat.qll 40d033de6c85ad042223e0da80479adebab3549439
 lib/codeql/rust/elements/ParenType.qll e1f5695b143c97b98ccdb460a5cf872461cfc13b83a4f005f26c288dc0afae10 1164f8efae7f255925411bddb33939fab0bf1c07955a16fef173b3f4675d09ae
 lib/codeql/rust/elements/Pat.qll 56211c5cb4709e7c12a2bfd2da5e413a451672d99e23a8386c08ad0b999fd45c b1b1893a13a75c4f0390f7e2a14ee98a46f067cfdc991a8d43adc82497d20aff
 lib/codeql/rust/elements/Path.qll 0655adfe84b08c286022a0307511a781bc1bfc943c12bc50600ebffb9d00e4b0 48e55afee9d019b7c62bfb02110c626c570ecbf683258cf23786807966f0b6fc
-lib/codeql/rust/elements/PathExpr.qll 99aa8af9deb9e276eb262b1fbd1a19f1c816cafac605aedb173ecb245c3c3cbd 306c837388ba60a5a89d2a546453527c62006696e15c043ed04d1ba27345815b
+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/PathSegment.qll 536a8fe172db367e5f1dc678a014e2350eadfc379242d2b5451725e826ab1448 1a3a237f56c1d9ccdce6832ec6417fed25cd3e29ba836363cc6085e2125de4c5
 lib/codeql/rust/elements/PathType.qll a7bd3b05dc2c0e96c91c5485db508a1f5bb8fe3a01486be6815ae9dabb163add b11e996b6c0cc21a3d8d1ddc23c37e4d54a78e84a9278b3ceca1e94cb7321532
@@ -127,7 +132,7 @@ lib/codeql/rust/elements/StmtList.qll 6f990782d5a5307d6d8a3256eb510aedfdaf7bd0e4
 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 6522741fb9f1fce1fe570c078e8c8a064d3bd4520c95cd5bb2d1eb1bb8a24861 be8dbf5418fd05f2dc9d72379ae6b78cb2469b0c0f8092e176c5937a46788e79
+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
@@ -170,10 +175,9 @@ lib/codeql/rust/elements/internal/AsmExprConstructor.qll 36c68023b58beec30af9f05
 lib/codeql/rust/elements/internal/AsmExprImpl.qll c34419c96378e2ae2ebb17d16f9efb4c97d3558919c252be9203aee223ac30a2 1d99c8fa35fabf931e564383c06c95fb39201fd588b759d28aef2fda7ed2c247
 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 0b07ae91f9ec7bc72f6d25dfdef3e64a43bcbda90b98b13cb90020d311c31b3d 1600194504ecc29ae10029fc5347bd76a40fa0d61dc6edccc6e66bbbba1b8fbe
+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/AstNodeImpl.qll 76446505990a4018cad1e70b1e8f3b819a18fa77b3411789fa8853dc9d439580 234e2a6a20abbf146807f7136dcb44ffeab5ca891b192a816a36222562805e66
 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
@@ -189,6 +193,7 @@ lib/codeql/rust/elements/internal/BreakExprConstructor.qll 356be043c28e0b34fdf92
 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
@@ -231,7 +236,6 @@ lib/codeql/rust/elements/internal/ForTypeImpl.qll b515639844778d0fbe51e6161a2ec1
 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/FormatArgsExprImpl.qll bdb992ebc6be59311b486f40325b39f52a69921cfc66a731085cb184da00050f 6336e7770f9cb700f1b3914fd940c3423ab4e971b34ed8fcc79da80c1f1cdba3
 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
@@ -324,6 +328,7 @@ lib/codeql/rust/elements/internal/ParenTypeConstructor.qll d62e656a4a3c8ffd4eb87
 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
@@ -393,7 +398,7 @@ lib/codeql/rust/elements/internal/TokenTreeImpl.qll c61574f2b551db24640258117e0c
 lib/codeql/rust/elements/internal/TraitAliasConstructor.qll d2f159cac53b9d65ec8176b8c8ccb944541cd35c64f0d1ceabb32cd975c000bf 6564981793de762af2775cc729e25054ea788648509d151cbfdbdf99fc9ed364
 lib/codeql/rust/elements/internal/TraitAliasImpl.qll f338dba5388973ec0c5928d4c60664737f75a93d0c7db5fb34053bc41c107641 f2e437469e4ba1d8dd321bc670978e7eed76508e728d1e08e52ddcf52a461d3a
 lib/codeql/rust/elements/internal/TraitConstructor.qll 1f790e63c32f1a22ae1b039ca585b5fe6ffef6339c1e2bf8bca108febb433035 535cebd676001bfbbb724d8006fa2da94e585951b8fd54c7dc092732214615b5
-lib/codeql/rust/elements/internal/TraitImpl.qll bd7f1cb81db69b32a8f540d6281af335fe4a4bc8b3667fb4464734d602359bb3 315f9107b1f74c51f99ec98a6af3d2a06bd11c81946990224002359db557c93f
+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
@@ -456,7 +461,7 @@ lib/codeql/rust/elements/internal/generated/ArrayExpr.qll 2ca97b602a707fe2c56600
 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 d1ccbc5cb8bd41895d954101046a7810c4dcd402b981e2b4d78ecdae994ecdb3 50a5b5b5073c8926efdaf0a9a3d9d86f03ef850f94503629392a0a762b20cb9b
+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/Attr.qll 2e7983b2c462750065ed58cc10c62e42012ddf0dd32f5439df7c6d6bf8ff349d e8270d33a50f088a83a2dfaa5b0a63ec775a6c97c8bf3a9383ce7a1ba8fe8fa3
@@ -468,9 +473,10 @@ lib/codeql/rust/elements/internal/generated/BoxPat.qll ec946a3e671ab7417e04b0207
 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 a10596deeb7b9799f0c0d9e9dfe43f5ff58ba03a9a444d581a240a99ca06a949 e94c2f6cd0190d108d0b91340227d45fb6b8c8c2c6a0476358fe75ea7f7a7760
+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
@@ -491,9 +497,12 @@ lib/codeql/rust/elements/internal/generated/FieldList.qll 43c13c6e3c9ba75a7a4cb8
 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/Function.qll c8826307fcb18daf8c59552a5c629a0e59e83e7f676b4a30408a042ecc216a46 ae27a8a709c187ffd6fa7e25e7850555d1be6633d6ee304457a4481135402dcb
+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
@@ -504,7 +513,7 @@ lib/codeql/rust/elements/internal/generated/Impl.qll e33ef5d3e49e64beca0ca9d5c0b
 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 70930ebfea4d0b56c0c47bede0c7aa21ec119210467fecc58a850273efb9080d c3bce1b435c3370083a3ef95da7647e720ca4e636b83dfa0ccecbf11f7ecd34b
+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
@@ -543,19 +552,20 @@ lib/codeql/rust/elements/internal/generated/ParamList.qll c808c9d84dd7800573832b
 lib/codeql/rust/elements/internal/generated/ParenExpr.qll bc0731505bfe88516205ec360582a4222d2681d11342c93e15258590ddee82f2 d4bd6e0c80cf1d63746c88d4bcb3a01d4c75732e5da09e3ebd9437ced227fb60
 lib/codeql/rust/elements/internal/generated/ParenPat.qll ce24b8f8ecbf0f204af200317405724063887257460c80cf250c39b2fdf37185 e7c87d37e1a0ca7ea03840017e1aa9ddb7f927f1f3b6396c0305b46aeee33db6
 lib/codeql/rust/elements/internal/generated/ParenType.qll 9cc954d73f8330dcac7b475f97748b63af5c8766dee9d2f2872c0a7e4c903537 c07534c8a9c683c4a9b11d490095647e420de0a0bfc23273eaf6f31b00244273
-lib/codeql/rust/elements/internal/generated/ParentChild.qll 99038e13a29e95611c11d77d7096577a6169fe806770dfdb9c39c17737e0a13c ad81306bd95d82724aedd186bb47c03910107bec509ef86fe55d07fb85baf6c7
+lib/codeql/rust/elements/internal/generated/ParentChild.qll b47dca44e6b74947419128e95d51e994ef28e59b02e81110b6a54eb5d2d46f30 f317538e9919e39dfbf3825a96231f8023568f2d4c61d814c4cebaaf8335f94c
 lib/codeql/rust/elements/internal/generated/Pat.qll 3605ac062be2f294ee73336e9669027b8b655f4ad55660e1eab35266275154ee 7f9400db2884d336dd1d21df2a8093759c2a110be9bf6482ce8e80ae0fd74ed4
 lib/codeql/rust/elements/internal/generated/Path.qll 299abce24762a5ab023f3cf1ab9718b83047e171aed42a8092e7a155914b1657 db1a23d18640c548f08c9f94823838b5e019ac85877c7b15df2d1493d1846572
-lib/codeql/rust/elements/internal/generated/PathExpr.qll 17cdb0a7393258a207450f08e37178fc9d35d167f064ba6015be94246f3dc933 a75fdd280aff6d87e083a92030e041c2eb52b57cf7151d4a6989fcd31d6a64bf
+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 dc03515d678ba052c2ff2dd9f0883e0bce54cac740ba9a15e5173f292c1b6971 dc03515d678ba052c2ff2dd9f0883e0bce54cac740ba9a15e5173f292c1b6971
+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 dcdd499e48ca8cc43354717791dec6341f744c38a133bb6a35ed44db3a2f16e2 1b9493df5e91be496d6f20ae0d9da5c49268377f7cc31f94bf171a8c387752d4
+lib/codeql/rust/elements/internal/generated/Raw.qll 33a346db246b169742c9f3c00b70a631f1305c2273b9abbeee9ef0dbc7b711c8 8eab21f53c60c1df042c6850b5d3474ad6330a3a71166e8e96a2738c7720800c
 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
@@ -580,11 +590,11 @@ lib/codeql/rust/elements/internal/generated/Static.qll 5fbd6879858cf356d4bdaa6da
 lib/codeql/rust/elements/internal/generated/Stmt.qll 8473ff532dd5cc9d7decaddcd174b94d610f6ca0aec8e473cc051dad9f3db917 6ef7d2b5237c2dbdcacbf7d8b39109d4dc100229f2b28b5c9e3e4fbf673ba72b
 lib/codeql/rust/elements/internal/generated/StmtList.qll a667193e32341e17400867c6e359878c4e645ef9f5f4d97676afc0283a33a026 a320ed678ee359302e2fc1b70a9476705cd616fcfa44a499d32f0c7715627f73
 lib/codeql/rust/elements/internal/generated/Struct.qll 4d57f0db12dc7ad3e31e750a24172ef1505406b4dab16386af0674bd18bf8f4b 1a73c83df926b996f629316f74c61ea775be04532ab61b56af904223354f033e
-lib/codeql/rust/elements/internal/generated/Synth.qll f02ed28dc96e2fd273109ee0564b6c6087b78d43d2a2a38bc4aeb25af79874cd f17c0118aadaf55f10036ace989ec5c925b1a2b8cfc2cbb63176751b26ff2636
-lib/codeql/rust/elements/internal/generated/SynthConstructors.qll 5d30b6d4f36791637f250734ee38820102c64f196454e20f79e30097da1a8e20 5d30b6d4f36791637f250734ee38820102c64f196454e20f79e30097da1a8e20
+lib/codeql/rust/elements/internal/generated/Synth.qll 68126fecadf402b76a30b6e916b1d1c15db1b06c48a401267bf59ac06aaa5ec3 545f3fa49591cf9a11b9bf6d9c860726db31dffe43be8c96ac3f2cac8d47c010
+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 a570fa93d0b78a35766b00d5ca256c102f824564248b9d8b678a981d6eea3e2e d9c7475e5102e21cfdee3b1791f89a4f9cdba5a4200349ff706532b704c02664
+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
@@ -615,7 +625,7 @@ lib/codeql/rust/elements/internal/generated/WhileExpr.qll fec8a9211b82a80601bf73
 lib/codeql/rust/elements/internal/generated/WildcardPat.qll d74b70b57a0a66bfae017a329352a5b27a6b9e73dd5521d627f680e810c6c59e 4b913b548ba27ff3c82fcd32cf996ff329cb57d176d3bebd0fcef394486ea499
 lib/codeql/rust/elements/internal/generated/YeetExpr.qll cac328200872a35337b4bcb15c851afb4743f82c080f9738d295571eb01d7392 94af734eea08129b587fed849b643e7572800e8330c0b57d727d41abda47930b
 lib/codeql/rust/elements/internal/generated/YieldExpr.qll 37e5f0c1e373a22bbc53d8b7f2c0e1f476e5be5080b8437c5e964f4e83fad79a 4a9a68643401637bf48e5c2b2f74a6bf0ddcb4ff76f6bffb61d436b685621e85
-lib/codeql/rust/elements.qll 28718424faf8e099bffc4f408409a9790f58ec0ce5618574a99a3f1118a3002e 28718424faf8e099bffc4f408409a9790f58ec0ce5618574a99a3f1118a3002e
+lib/codeql/rust/elements.qll 6dc44d60d8180da23e7df8815adafa506936c7704723df0592bd1c6c60280abe 6dc44d60d8180da23e7df8815adafa506936c7704723df0592bd1c6c60280abe
 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
@@ -629,9 +639,6 @@ test/extractor-tests/generated/ArrayType/ArrayType_getTy.ql 1c23613e509ada3ffc1f
 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/AssocItemList/AssocItemList.ql 0ea572b1350f87cc09ce4dc1794b392cc9ad292abb8439c106a7a1afe166868b 6e7493a3ace65c68b714e31234e149f3fc44941c3b4d125892531102b1060b2f
-test/extractor-tests/generated/AssocItemList/AssocItemList_getAssocItem.ql 8149d905f6fc6caeb51fa1ddec787d0d90f4642687461c7b1a9d4ab93a27d65d 8fb9caad7d88a89dd71e5cc8e17496afbdf33800e58179f424ef482b1b765bb1
-test/extractor-tests/generated/AssocItemList/AssocItemList_getAttr.ql 06526c4a28fd4fdce04ca15fbadc2205b13dcc2d2de24177c370d812e02540e6 79c8ce6e1f8acc1aaca498531e2c1a0e7e2c0f2459d7fc9fe485fd82263c433f
 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
@@ -674,16 +681,18 @@ test/extractor-tests/generated/CastExpr/CastExpr_getExpr.ql c37186b8f3e3dab8ae28
 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 430d566d8176d7b98d6cde6c35f9420249236eddb084f9c7cbb091cc683ff063 6b8127425cad540a1e407ff7b387f3924253da980f46e5a678aeb2870ba6ec7b
+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/Comment/Comment.ql 5428b8417a737f88f0d55d87de45c4693d81f03686f03da11dc5369e163d977b 8948c1860cde198d49cff7c74741f554a9e89f8af97bb94de80f3c62e1e29244
-test/extractor-tests/generated/Const/Const.ql d02d4010c54f2cfcb9251f362c3768740399807eb4fe995373d9a316f14e7a8b 8d277779d3d3ded5cf0829dc9bfd8936f2334d89de4a84e110f0a017224729a5
+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
@@ -701,8 +710,10 @@ test/extractor-tests/generated/ContinueExpr/ContinueExpr_getAttr.ql acb261869d3b
 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 d4dd671130089b3f62c9f2deb84fa78b33bffb69d88899bd37db9d54b8195d2b c32c6b9772bfebf01ab812b7f60621f16f843c8ab1b78e34b440442d69f5ef27
+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
@@ -710,12 +721,16 @@ test/extractor-tests/generated/Enum/Enum_getVisibility.ql 7fdae1b147d3d2ed41e055
 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 0c50adb4ce7479100fe46e097801df699911b4888a4919aa7ca337e2ef8a2525 101eee87add6793006bac20a2f7d0e245a1c04cbc81834b6130db083578b0c5f
+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 ff105190427f15403325cc1e15a09baa8e79f8115dfd2d50435e4eeda0b715b9 1c8e30eb91b0d42ba319b07c98182b39859447069af7958b6faa518713c98f75
+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
@@ -746,10 +761,12 @@ test/extractor-tests/generated/FormatArgsExpr/FormatArgsExpr.ql 0cd439f61569ecf0
 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 28776a499f21ab36c9dfcb905861cf0bf0a2c51f24d6d9401ca45f67d9f982b0 1ded959dfd9c216975572c4577c6a2d4c56a2d3d4a2dd5b0f3f90adff98d86aa
+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
@@ -769,9 +786,11 @@ test/extractor-tests/generated/IfExpr/IfExpr_getAttr.ql f5872cdbb21683bed689e753
 test/extractor-tests/generated/IfExpr/IfExpr_getCondition.ql 5bab301a1d53fe6ee599edfb17f9c7edb2410ec6ea7108b3f4a5f0a8d14316e3 355183b52cca9dc81591a09891dab799150370fff2034ddcbf7b1e4a7cb43482
 test/extractor-tests/generated/IfExpr/IfExpr_getElse.ql 8674cedf42fb7be513fdf6b9c3988308453ae3baf8051649832e7767b366c12f e064e5f0b8e394b080a05a7bccd57277a229c1f985aa4df37daea26aeade4603
 test/extractor-tests/generated/IfExpr/IfExpr_getThen.ql 0989ddab2c231c0ee122ae805ffa0d3f0697fb7b6d9e53ee6d32b9140d4b0421 81028f9cd6b417c63091d46a8b85c3b32b1c77eea885f3f93ae12c99685bfe0a
-test/extractor-tests/generated/Impl/Impl.ql b879d3101c31d57c1b7b794c241678214f65fcb1b33ec45919948809d1d62f6c 769c7a691a8034db4cc12bc8cd8df3a8ae765a3fb83bb6a5efe6e310328d800c
+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
@@ -818,15 +837,19 @@ test/extractor-tests/generated/LoopExpr/LoopExpr.ql 636c28bff5f8c1ca0fb834f614b3
 test/extractor-tests/generated/LoopExpr/LoopExpr_getAttr.ql d557c1a34ae8762b32702d6b50e79c25bc506275c33a896b6b94bbbe73d04c49 34846c9eefa0219f4a16e28b518b2afa23f372d0aa03b08d042c5a35375e0cd6
 test/extractor-tests/generated/LoopExpr/LoopExpr_getLabel.ql 0b77b9d9fb5903d37bce5a2c0d6b276e6269da56fcb37b83cd931872fb88490f c7f09c526e59dcadec13ec9719980d68b8619d630caab2c26b8368b06c1f2cc0
 test/extractor-tests/generated/LoopExpr/LoopExpr_getLoopBody.ql 0267f54077640f3dfeb38524577e4a1229115eeb1c839398d0c5f460c1d65129 96ec876635b8c561f7add19e57574444f630eae3df9ab9bc33ac180e61f3a7b8
-test/extractor-tests/generated/MacroCall/MacroCall.ql 9eca338d7bc42dcfc3cfcd7953484d724d4f06b1182c01a426925d9963820e37 25fe9e90c38d3bd0c92c70bf2af01b034e3c375f3dbd1c1b8aab1fc1aae09547
+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 dde2df9196800d9af9645fe21786e30245bff6cfa58117900582ce1f5c0b859d 6b87bec4e4df8e9b6ed09f18e7b7c20204c39c8d249494cc66d3a06ae39791e4
+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
@@ -835,8 +858,10 @@ test/extractor-tests/generated/MacroItems/MacroItems.ql 876b5d2a4ce7dcb599e02208
 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 0742faf18179fa34e0f43361e9e4b807bfc242d232f6b3664a35e138a47d39c5 10e1cf45f32a27cb46bd61f5dd45416e2c0c9f25e880f6d213597a7d96e19103
+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
@@ -869,8 +894,10 @@ test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getAttr.ql 2ce876a0
 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/Module/Module.ql 6418f9760fd67de8f3d9d8414f4750ea7cd19b481b46bfb7d4bb0ce74327bb3c 2c7eefa44243b1d29bd22875e90f2a715c3898919ba2ebbd4805db9ee49d0cde
+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
@@ -990,9 +1017,11 @@ test/extractor-tests/generated/SliceType/SliceType_getTy.ql 0bc70c0e60fc3552584b
 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 605b1c3b5664db0c8738c4159af0958a3d73ee4a180a8e022c1ef6b214d3d26f eb351abb9d55816b9d05c3849913074faf272a8ff267919a3d98d23ae67c7b5b
+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
@@ -1000,24 +1029,33 @@ test/extractor-tests/generated/StmtList/StmtList.ql 0010df0d5e30f7bed3bd5d916faf
 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 d79ad03043f5a94b977fe1605489f057d56acf4b56f7284b6ce1a8779d803ea8 8ffe7775ec0b606d730bd3b2a5c37fc181a9ece3c2f7747c21b71503d20aa6d6
+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/Trait.ql a80249a821a91e11592227126209090ce5ced83a6168136f7c53db61b5bc3914 4555281baf4d9f736a68d28c6c7b788b913933a38503a323783d57db9e8c5c02
+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 328b81e9ce5a5c1030277d3ccdac6b1de2f5845e28a253c1c7d88850a0bf03fd 62407b39c24dc2eca89aaeecbc033d28fc9ffbe625ad40d1633fcb08d8f5c217
+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
@@ -1042,8 +1080,10 @@ test/extractor-tests/generated/TupleStructPat/TupleStructPat_getField.ql f3f2e23
 test/extractor-tests/generated/TupleStructPat/TupleStructPat_getPath.ql 13a06696bbf1fa8d5b73107e28cdba40e93da04b27f9c54381b78a52368d2ad1 5558c35ea9bb371ad90a5b374d7530dd1936f83e6ba656ebfbfd5bd63598e088
 test/extractor-tests/generated/TupleType/TupleType.ql e5951a30817b8c51fe9cb9435f75bfdca2a1277b2094267d3205e33ef1ee9a9c 9a4d57322ed2cff57057654272981b056f833136f983141b033afaf64e19c117
 test/extractor-tests/generated/TupleType/TupleType_getField.ql b73a8cdaf6ba46cf9b63d8819239d2d2c06b3496ed4768e8a387a7558178fbd8 6efbcf13c25d0ff3ed0c6d194ba44d2abfa620406badef8184953395fab92bb4
-test/extractor-tests/generated/TypeAlias/TypeAlias.ql 8fc7144467f3be85ffcc661630cc144a244b636220aca69f1074f8b7221eb32f 692417975c0062d4d324e8a4b5c4a95bc352bfbab03664f671240739d1ddfcfc
+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
@@ -1065,15 +1105,19 @@ test/extractor-tests/generated/TypeParam/TypeParam_getName.ql 9d5b6d6a9f2a5793e2
 test/extractor-tests/generated/TypeParam/TypeParam_getTypeBoundList.ql 080a6b370ad460bf128fdfd632aa443af2ad91c3483e192ad756eb234dbfa4d8 8b048d282963f670db357f1eef9b8339f83d03adf57489a22b441d5c782aff62
 test/extractor-tests/generated/UnderscoreExpr/UnderscoreExpr.ql 4ad6ed0c803fb4f58094a55b866940b947b16259756c674200172551ee6546e0 d3270bdcc4c026325159bd2a59848eb51d96298b2bf21402ea0a83ac1ea6d291
 test/extractor-tests/generated/UnderscoreExpr/UnderscoreExpr_getAttr.ql d8502be88bcd97465f387c410b5078a4709e32b2baa556a4918ea5e609c40dd7 b238dc37404254e3e7806d50a7b1453e17e71da122931331b16a55853d3a843f
-test/extractor-tests/generated/Union/Union.ql c3e3307d406616ecfc4b6cd0d533591f539af6960efe61a8acff65e6e639586b a5c22ccaea66b18503b96773c8acf75f0f08a8e2544989e288c5e94c76d04d2f
+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 e17104b0664bd772e04398b355d4c0546f67ed66755d52febf3eb344dafe7a44 68701f1bb78b8c88a9a96e3e4b15e8be60cc1f2781fde9162aa7285ad3e57034
+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
diff --git a/rust/ql/.gitattributes b/rust/ql/.gitattributes
index 87f0154882a..2d19334cbc7 100644
--- a/rust/ql/.gitattributes
+++ b/rust/ql/.gitattributes
@@ -18,6 +18,7 @@
 /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
@@ -41,8 +42,11 @@
 /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
@@ -96,6 +100,7 @@
 /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
@@ -175,7 +180,6 @@
 /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/AstNodeImpl.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
@@ -191,6 +195,7 @@
 /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
@@ -233,7 +238,6 @@
 /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/FormatArgsExprImpl.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
@@ -326,6 +330,7 @@
 /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
@@ -470,6 +475,7 @@
 /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
@@ -493,8 +499,11 @@
 /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
@@ -549,6 +558,7 @@
 /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
@@ -631,9 +641,6 @@
 /test/extractor-tests/generated/AsmExpr/AsmExpr.ql linguist-generated
 /test/extractor-tests/generated/AsmExpr/AsmExpr_getAttr.ql linguist-generated
 /test/extractor-tests/generated/AsmExpr/AsmExpr_getExpr.ql linguist-generated
-/test/extractor-tests/generated/AssocItemList/AssocItemList.ql linguist-generated
-/test/extractor-tests/generated/AssocItemList/AssocItemList_getAssocItem.ql linguist-generated
-/test/extractor-tests/generated/AssocItemList/AssocItemList_getAttr.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
@@ -686,6 +693,8 @@
 /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
@@ -705,6 +714,8 @@
 /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
@@ -715,9 +726,13 @@
 /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
@@ -752,6 +767,8 @@
 /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
@@ -774,6 +791,8 @@
 /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
@@ -822,13 +841,17 @@
 /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
@@ -839,6 +862,8 @@
 /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
@@ -873,6 +898,8 @@
 /test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getReceiver.ql linguist-generated
 /test/extractor-tests/generated/Module/Module.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
@@ -995,6 +1022,8 @@
 /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
@@ -1004,15 +1033,22 @@
 /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
@@ -1020,6 +1056,8 @@
 /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
@@ -1046,6 +1084,8 @@
 /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
@@ -1069,6 +1109,8 @@
 /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
@@ -1076,6 +1118,8 @@
 /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
diff --git a/rust/ql/consistency-queries/AstConsistency.ql b/rust/ql/consistency-queries/AstConsistency.ql
index 2187f53b61f..1db4f27bef2 100644
--- a/rust/ql/consistency-queries/AstConsistency.ql
+++ b/rust/ql/consistency-queries/AstConsistency.ql
@@ -1,21 +1,8 @@
-import rust
-import codeql.rust.elements.internal.generated.ParentChild
+/**
+ * @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
+ */
 
-query predicate multipleToString(Element e, string s) {
-  s = strictconcat(e.toString(), ",") and
-  strictcount(e.toString()) > 1
-}
-
-query predicate multipleLocations(Locatable e) { strictcount(e.getLocation()) > 1 }
-
-query predicate multiplePrimaryQlClasses(Element e, string s) {
-  s = e.getPrimaryQlClasses() and
-  strictcount(e.getAPrimaryQlClass()) > 1
-}
-
-private Element getParent(Element child) { child = getChildAndAccessor(result, _, _) }
-
-query predicate multipleParents(Element child, Element parent) {
-  parent = getParent(child) and
-  strictcount(getParent(child)) > 1
-}
+import codeql.rust.AstConsistency
diff --git a/rust/ql/consistency-queries/CfgConsistency.ql b/rust/ql/consistency-queries/CfgConsistency.ql
index 3a95fde507b..4e155ca307b 100644
--- a/rust/ql/consistency-queries/CfgConsistency.ql
+++ b/rust/ql/consistency-queries/CfgConsistency.ql
@@ -1,37 +1,8 @@
-import rust
-import codeql.rust.controlflow.internal.ControlFlowGraphImpl::Consistency as Consistency
-import Consistency
-import codeql.rust.controlflow.ControlFlowGraph
-import codeql.rust.controlflow.internal.ControlFlowGraphImpl as CfgImpl
-import codeql.rust.controlflow.internal.Completion
-
 /**
- * All `Expr` nodes are `PostOrderTree`s
+ * @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
  */
-query predicate nonPostOrderExpr(Expr e, string cls) {
-  cls = e.getPrimaryQlClasses() and
-  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
-  )
-}
 
-query predicate scopeNoFirst(CfgScope scope) {
-  Consistency::scopeNoFirst(scope) and
-  not scope = any(Function f | not exists(f.getBody())) and
-  not scope = any(ClosureExpr c | not exists(c.getBody()))
-}
-
-/** 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))
-}
-
-query predicate deadEnd(CfgImpl::Node node) {
-  Consistency::deadEnd(node) and
-  not letElsePanic(node.getAstNode())
-}
+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..7d63aa7d68a
--- /dev/null
+++ b/rust/ql/consistency-queries/DataFlowConsistency.ql
@@ -0,0 +1,9 @@
+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
index 20148f0cea2..8b1f0adca94 100644
--- a/rust/ql/consistency-queries/ExtractionConsistency.ql
+++ b/rust/ql/consistency-queries/ExtractionConsistency.ql
@@ -1,3 +1,10 @@
+/**
+ * @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() }
diff --git a/rust/integration-tests/conftest.py b/rust/ql/integration-tests/conftest.py
similarity index 100%
rename from rust/integration-tests/conftest.py
rename to rust/ql/integration-tests/conftest.py
diff --git a/rust/integration-tests/hello-project/functions.expected b/rust/ql/integration-tests/hello-project/functions.expected
similarity index 100%
rename from rust/integration-tests/hello-project/functions.expected
rename to rust/ql/integration-tests/hello-project/functions.expected
diff --git a/rust/integration-tests/hello-project/functions.ql b/rust/ql/integration-tests/hello-project/functions.ql
similarity index 100%
rename from rust/integration-tests/hello-project/functions.ql
rename to rust/ql/integration-tests/hello-project/functions.ql
diff --git a/rust/integration-tests/hello-project/manifests/Cargo.toml b/rust/ql/integration-tests/hello-project/manifests/Cargo.toml
similarity index 100%
rename from rust/integration-tests/hello-project/manifests/Cargo.toml
rename to rust/ql/integration-tests/hello-project/manifests/Cargo.toml
diff --git a/rust/integration-tests/hello-project/manifests/rust-project.json b/rust/ql/integration-tests/hello-project/manifests/rust-project.json
similarity index 100%
rename from rust/integration-tests/hello-project/manifests/rust-project.json
rename to rust/ql/integration-tests/hello-project/manifests/rust-project.json
diff --git a/rust/integration-tests/hello-project/source_archive.expected b/rust/ql/integration-tests/hello-project/source_archive.expected
similarity index 100%
rename from rust/integration-tests/hello-project/source_archive.expected
rename to rust/ql/integration-tests/hello-project/source_archive.expected
diff --git a/rust/integration-tests/hello-project/src/directory_module/mod.rs b/rust/ql/integration-tests/hello-project/src/directory_module/mod.rs
similarity index 100%
rename from rust/integration-tests/hello-project/src/directory_module/mod.rs
rename to rust/ql/integration-tests/hello-project/src/directory_module/mod.rs
diff --git a/rust/integration-tests/hello-project/src/directory_module/not_loaded.rs b/rust/ql/integration-tests/hello-project/src/directory_module/nested_module.rs
similarity index 100%
rename from rust/integration-tests/hello-project/src/directory_module/not_loaded.rs
rename to rust/ql/integration-tests/hello-project/src/directory_module/nested_module.rs
diff --git a/rust/integration-tests/hello-project/src/file_module.rs b/rust/ql/integration-tests/hello-project/src/directory_module/not_loaded.rs
similarity index 100%
rename from rust/integration-tests/hello-project/src/file_module.rs
rename to rust/ql/integration-tests/hello-project/src/directory_module/not_loaded.rs
diff --git a/rust/integration-tests/hello-workspace/exe/src/a_module.rs b/rust/ql/integration-tests/hello-project/src/file_module.rs
similarity index 100%
rename from rust/integration-tests/hello-workspace/exe/src/a_module.rs
rename to rust/ql/integration-tests/hello-project/src/file_module.rs
diff --git a/rust/integration-tests/hello-project/src/main.rs b/rust/ql/integration-tests/hello-project/src/main.rs
similarity index 100%
rename from rust/integration-tests/hello-project/src/main.rs
rename to rust/ql/integration-tests/hello-project/src/main.rs
diff --git a/rust/integration-tests/hello-project/test_project.py b/rust/ql/integration-tests/hello-project/test_project.py
similarity index 100%
rename from rust/integration-tests/hello-project/test_project.py
rename to rust/ql/integration-tests/hello-project/test_project.py
diff --git a/rust/integration-tests/hello-workspace/exe/Cargo.toml b/rust/ql/integration-tests/hello-workspace/exe/Cargo.toml
similarity index 100%
rename from rust/integration-tests/hello-workspace/exe/Cargo.toml
rename to rust/ql/integration-tests/hello-workspace/exe/Cargo.toml
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/integration-tests/hello-workspace/exe/src/main.rs b/rust/ql/integration-tests/hello-workspace/exe/src/main.rs
similarity index 100%
rename from rust/integration-tests/hello-workspace/exe/src/main.rs
rename to rust/ql/integration-tests/hello-workspace/exe/src/main.rs
diff --git a/rust/integration-tests/hello-workspace/functions.expected b/rust/ql/integration-tests/hello-workspace/functions.expected
similarity index 100%
rename from rust/integration-tests/hello-workspace/functions.expected
rename to rust/ql/integration-tests/hello-workspace/functions.expected
diff --git a/rust/integration-tests/hello-workspace/functions.ql b/rust/ql/integration-tests/hello-workspace/functions.ql
similarity index 100%
rename from rust/integration-tests/hello-workspace/functions.ql
rename to rust/ql/integration-tests/hello-workspace/functions.ql
diff --git a/rust/integration-tests/hello-workspace/lib/Cargo.toml b/rust/ql/integration-tests/hello-workspace/lib/Cargo.toml
similarity index 100%
rename from rust/integration-tests/hello-workspace/lib/Cargo.toml
rename to rust/ql/integration-tests/hello-workspace/lib/Cargo.toml
diff --git a/rust/integration-tests/hello-workspace/lib/src/a_module/mod.rs b/rust/ql/integration-tests/hello-workspace/lib/src/a_module/mod.rs
similarity index 100%
rename from rust/integration-tests/hello-workspace/lib/src/a_module/mod.rs
rename to rust/ql/integration-tests/hello-workspace/lib/src/a_module/mod.rs
diff --git a/rust/integration-tests/hello-workspace/lib/src/lib.rs b/rust/ql/integration-tests/hello-workspace/lib/src/lib.rs
similarity index 100%
rename from rust/integration-tests/hello-workspace/lib/src/lib.rs
rename to rust/ql/integration-tests/hello-workspace/lib/src/lib.rs
diff --git a/rust/integration-tests/hello-workspace/manifests/Cargo.toml b/rust/ql/integration-tests/hello-workspace/manifests/Cargo.toml
similarity index 100%
rename from rust/integration-tests/hello-workspace/manifests/Cargo.toml
rename to rust/ql/integration-tests/hello-workspace/manifests/Cargo.toml
diff --git a/rust/integration-tests/hello-workspace/manifests/rust-project.json b/rust/ql/integration-tests/hello-workspace/manifests/rust-project.json
similarity index 100%
rename from rust/integration-tests/hello-workspace/manifests/rust-project.json
rename to rust/ql/integration-tests/hello-workspace/manifests/rust-project.json
diff --git a/rust/integration-tests/hello-workspace/source_archive.expected b/rust/ql/integration-tests/hello-workspace/source_archive.expected
similarity index 100%
rename from rust/integration-tests/hello-workspace/source_archive.expected
rename to rust/ql/integration-tests/hello-workspace/source_archive.expected
diff --git a/rust/integration-tests/hello-workspace/test_workspace.py b/rust/ql/integration-tests/hello-workspace/test_workspace.py
similarity index 100%
rename from rust/integration-tests/hello-workspace/test_workspace.py
rename to rust/ql/integration-tests/hello-workspace/test_workspace.py
diff --git a/rust/integration-tests/qlpack.lock.yml b/rust/ql/integration-tests/qlpack.lock.yml
similarity index 100%
rename from rust/integration-tests/qlpack.lock.yml
rename to rust/ql/integration-tests/qlpack.lock.yml
diff --git a/rust/integration-tests/qlpack.yml b/rust/ql/integration-tests/qlpack.yml
similarity index 100%
rename from rust/integration-tests/qlpack.yml
rename to rust/ql/integration-tests/qlpack.yml
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 b/rust/ql/integration-tests/qltest/failing_cargo_check/options
new file mode 100644
index 00000000000..c7a0beabb53
--- /dev/null
+++ b/rust/ql/integration-tests/qltest/failing_cargo_check/options
@@ -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..87d9a09cef4
--- /dev/null
+++ b/rust/ql/integration-tests/qltest/test.py
@@ -0,0 +1,17 @@
+import runs_on
+# 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}`)
+
+def test_lib(codeql, rust, cwd):
+    codeql.test.run("lib", threads=1)
+
+def test_main(codeql, rust):
+    codeql.test.run("main", threads=1)
+
+def test_failing_cargo_check(codeql, rust):
+    out = codeql.test.run("failing_cargo_check", threads=1, show_extractor_output=True,
+                          _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/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
index 58de14b8fcf..f0eeed219c3 100644
--- a/rust/ql/lib/codeql/rust/Diagnostics.qll
+++ b/rust/ql/lib/codeql/rust/Diagnostics.qll
@@ -1,6 +1,7 @@
 /** 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 {
@@ -10,7 +11,12 @@ class Diagnostic extends @diagnostic {
   string fullMessage;
   Location location;
 
-  Diagnostic() { diagnostics(this, severity, tag, message, fullMessage, 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.
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..668533f1c3d
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/controlflow/internal/CfgConsistency.qll
@@ -0,0 +1,98 @@
+/**
+ * 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(Function f | not exists(f.getBody())) and
+  not scope = any(ClosureExpr c | not exists(c.getBody()))
+}
+
+/** 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 a72b904dcf1..55bd269087d 100644
--- a/rust/ql/lib/codeql/rust/controlflow/internal/Completion.qll
+++ b/rust/ql/lib/codeql/rust/controlflow/internal/Completion.qll
@@ -36,13 +36,7 @@ class SimpleCompletion extends NormalCompletion, TSimpleCompletion {
 
   // `SimpleCompletion` is the "default" completion type, thus it is valid for
   // any node where there isn't another more specific completion type.
-  override predicate isValidFor(AstNode e) {
-    not any(Completion c).isValidForSpecific(e)
-    or
-    // A `?` expression can both proceed normally or cause an early return, so
-    // we explicitly allow the former here.
-    e instanceof TryExpr
-  }
+  override predicate isValidFor(AstNode e) { not any(Completion c).isValidForSpecific(e) }
 
   override string toString() { result = "simple" }
 }
@@ -177,6 +171,8 @@ class MatchCompletion extends TMatchCompletion, ConditionalCompletion {
   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 }
diff --git a/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll b/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll
index f6587bf7655..72a8098eb10 100644
--- a/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll
+++ b/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll
@@ -5,6 +5,7 @@ private import Scope as Scope
 private import codeql.rust.controlflow.ControlFlowGraph as Cfg
 
 private module CfgInput implements InputSig<Location> {
+  private import codeql.rust.internal.CachedStages
   private import rust as Rust
   private import Completion as C
 
@@ -21,7 +22,10 @@ private 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.getEnclosingCallable() and
+    Stages::CfgStage::ref()
+  }
 
   class SuccessorType = Cfg::SuccessorType;
 
@@ -40,10 +44,12 @@ private module CfgInput implements InputSig<Location> {
   predicate successorTypeIsCondition(SuccessorType t) { t instanceof Cfg::BooleanSuccessor }
 
   /** Holds if `first` is first executed when entering `scope`. */
-  predicate scopeFirst(CfgScope scope, AstNode first) { scope.scopeFirst(first) }
+  predicate scopeFirst(CfgScope scope, AstNode first) {
+    first(scope.(CfgScopeTree).getFirstChildNode(), first)
+  }
 
   /** Holds if `scope` is exited when `last` finishes with completion `c`. */
-  predicate scopeLast(CfgScope scope, AstNode last, Completion c) { scope.scopeLast(last, c) }
+  predicate scopeLast(CfgScope scope, AstNode last, Completion c) { last(scope.getBody(), last, c) }
 }
 
 private module CfgSplittingInput implements SplittingInputSig<Location, CfgInput> {
@@ -65,157 +71,7 @@ private module CfgImpl =
 
 import CfgImpl
 
-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 LogicalOrTree 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 LogicalAndTree 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)
-  }
-}
-
-class BlockExprTree extends StandardPostOrderTree, BlockExpr {
-  override AstNode getChildNode(int i) {
-    result = this.getStmtList().getStatement(i)
-    or
-    i = this.getStmtList().getNumberOfStatements() and
-    result = this.getStmtList().getTailExpr()
-  }
-
-  override predicate propagatesAbnormal(AstNode child) { child = this.getChildNode(_) }
-}
-
-class BreakExprTree extends PostOrderTree, BreakExpr {
-  override predicate propagatesAbnormal(AstNode child) { child = this.getExpr() }
-
-  override predicate first(AstNode node) {
-    first(this.getExpr(), node)
-    or
-    not this.hasExpr() and node = this
-  }
-
-  override predicate last(AstNode last, Completion c) { none() }
-
-  override predicate succ(AstNode pred, AstNode succ, Completion c) {
-    last(super.getExpr(), pred, c) and succ = this
-    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 ClosureExprTree extends StandardTree, ClosureExpr {
-  override predicate first(AstNode first) { first = this }
-
-  override predicate last(AstNode last, Completion c) {
-    last = this and
-    completionIsValidFor(c, this)
-  }
-
-  override predicate propagatesAbnormal(AstNode child) { none() }
-
-  override AstNode getChildNode(int i) {
-    result = this.getParamList().getParam(i)
-    or
-    i = this.getParamList().getNumberOfParams() and
-    result = this.getBody()
-  }
-}
-
-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 ExprStmtTree extends StandardPreOrderTree instanceof ExprStmt {
-  override AstNode getChildNode(int i) { i = 0 and result = super.getExpr() }
-}
-
-class FieldExprTree extends StandardPostOrderTree instanceof FieldExpr {
-  override AstNode getChildNode(int i) { i = 0 and result = super.getExpr() }
-}
-
-class FunctionTree extends StandardTree, Function {
+class CfgScopeTree extends StandardTree, Scope::CfgScope {
   override predicate first(AstNode first) { first = this }
 
   override predicate last(AstNode last, Completion c) {
@@ -237,57 +93,11 @@ class ParamTree extends StandardPostOrderTree, Param {
   override AstNode getChildNode(int i) { i = 0 and result = this.getPat() }
 }
 
-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 ExprStmtTree extends StandardPreOrderTree instanceof ExprStmt {
+  override AstNode getChildNode(int i) { i = 0 and result = super.getExpr() }
 }
 
-class FormatArgsExprTree extends StandardPostOrderTree, FormatArgsExpr {
-  override AstNode getChildNode(int i) {
-    i = -1 and result = this.getTemplate()
-    or
-    result = this.getArg(i).getExpr()
-  }
-}
-
-class IndexExprTree extends StandardPostOrderTree instanceof IndexExpr {
-  override AstNode getChildNode(int i) {
-    i = 0 and result = super.getBase()
-    or
-    i = 1 and result = super.getIndex()
-  }
-}
+class FormatTemplateVariableAccessTree extends LeafTree, FormatTemplateVariableAccess { }
 
 class ItemTree extends LeafTree, Item {
   ItemTree() {
@@ -296,19 +106,6 @@ class ItemTree extends LeafTree, Item {
   }
 }
 
-// `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 LetStmtTree extends PreOrderTree, LetStmt {
   final override predicate propagatesAbnormal(AstNode child) {
     child = [this.getInitializer(), this.getLetElse().getBlockExpr()]
@@ -325,7 +122,7 @@ class LetStmtTree extends PreOrderTree, LetStmt {
     not this.hasInitializer()
     or
     // Edge from end of initializer to pattern.
-    last(this.getInitializer(), pred, c) and first(this.getPat(), succ)
+    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
@@ -340,97 +137,6 @@ class LetStmtTree extends PreOrderTree, LetStmt {
   }
 }
 
-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 MacroCallTree extends ControlFlowTree, MacroCall {
   override predicate first(AstNode first) {
     first(this.getExpanded(), first)
@@ -451,10 +157,6 @@ class MacroCallTree extends ControlFlowTree, MacroCall {
   override predicate propagatesAbnormal(AstNode child) { child = this.getExpanded() }
 }
 
-class MacroExprTree extends StandardPostOrderTree, MacroExpr {
-  override AstNode getChildNode(int i) { i = 0 and result = this.getMacroCall() }
-}
-
 class MacroStmtsTree extends StandardPreOrderTree, MacroStmts {
   override AstNode getChildNode(int i) {
     result = this.getStatement(i)
@@ -494,108 +196,415 @@ class MatchArmTree extends ControlFlowTree, MatchArm {
   }
 }
 
-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.
-    last(super.getExpr(), pred, c) and
-    first(super.getArm(0).getPat(), succ) and
-    completionIsNormal(c)
-    or
-    // Edge from a failed match/guard in one arm to the beginning of the next arm.
-    exists(int i |
-      last(super.getArm(i), 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) {
-    i = 0 and
-    result = this.getReceiver()
-    or
-    result = this.getArgList().getArg(i + 1)
-  }
-}
-
 class NameTree extends LeafTree, Name { }
 
 class NameRefTree extends LeafTree, NameRef { }
 
-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 TypeRefTree extends LeafTree instanceof TypeRef { }
 
-class UnderscoreExprTree extends LeafTree instanceof UnderscoreExpr { }
+/**
+ * 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) }
+  }
 
-// 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() }
-}
+  class AsmExprTree extends LeafTree instanceof AsmExpr { }
 
-// 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() }
+  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)
+    }
+  }
+
+  class BlockExprTree extends StandardPostOrderTree, BlockExpr {
+    override AstNode getChildNode(int i) {
+      result = this.getStmtList().getStatement(i)
+      or
+      i = this.getStmtList().getNumberOfStatements() and
+      result = this.getStmtList().getTailExpr()
+    }
+
+    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() }
+  }
 }
 
 /**
@@ -605,75 +614,36 @@ class YeetExprTree extends StandardPostOrderTree instanceof YeetExpr {
  * `OrPat`s and `IdentPat`s.
  */
 module PatternTrees {
-  abstract class PreOrderPatTree extends PreOrderTree {
+  abstract class StandardPatTree extends StandardTree {
     abstract Pat getPat(int i);
 
-    private Pat getPatRanked(int i) {
+    Pat getPatRanked(int i) {
       result = rank[i + 1](Pat pat, int j | pat = this.getPat(j) | pat order by j)
     }
 
-    override predicate propagatesAbnormal(AstNode child) { child = this.getPatRanked(_) }
+    override AstNode getChildNode(int i) { result = this.getPat(i) }
+  }
 
+  abstract class PreOrderPatTree extends StandardPatTree, StandardPreOrderTree {
     override predicate succ(AstNode pred, AstNode succ, Completion c) {
-      pred = this and
-      completionIsValidFor(c, this) and
       c.(MatchCompletion).succeeded() and
-      first(this.getPatRanked(0), succ)
-      or
-      exists(int i | last(this.getPatRanked(i), pred, c) |
-        // Edge from successful pattern to the next
-        c.(MatchCompletion).succeeded() and
-        first(this.getPatRanked(i + 1), succ)
+      (
+        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) {
-      node = this and
+      super.last(node, c)
+      or
+      c.(MatchCompletion).failed() and
       completionIsValidFor(c, this) and
-      c.(MatchCompletion).failed()
-      or
-      exists(int i | last(this.getPatRanked(i), node, c) |
-        c.(MatchCompletion).failed()
-        or
-        not exists(this.getPatRanked(i + 1)) and
-        completionIsNormal(c)
-      )
+      (node = this or last(this.getPatRanked(_), node, c))
     }
   }
 
-  abstract class PostOrderPatTree extends PostOrderTree {
-    abstract Pat getPat(int i);
-
-    private Pat getPatRanked(int i) {
-      result = rank[i + 1](Pat pat, int j | pat = this.getPat(j) | pat order by j)
-    }
-
-    override predicate propagatesAbnormal(AstNode child) { child = this.getPatRanked(_) }
-
-    override predicate first(AstNode node) {
-      first(this.getPat(0), node)
-      or
-      not exists(this.getPat(_)) and
-      node = this
-    }
-
-    override predicate succ(AstNode pred, AstNode succ, Completion c) {
-      exists(int i | last(this.getPat(i), pred, c) |
-        // Edge from unsuccessful pattern to the next
-        c.(MatchCompletion).failed() and
-        first(this.getPat(i + 1), succ)
-        or
-        // Edge from successful pattern to this
-        c.(MatchCompletion).succeeded() and
-        succ = this
-        or
-        // Edge from last pattern to this
-        not exists(this.getPat(i + 1)) and
-        succ = this and
-        completionIsNormal(c)
-      )
-    }
-  }
+  abstract class PostOrderPatTree extends StandardPatTree, StandardPostOrderTree { }
 
   class IdentPatTree extends PostOrderPatTree, IdentPat {
     override Pat getPat(int i) { i = 0 and result = this.getPat() }
@@ -681,13 +651,11 @@ module PatternTrees {
     override predicate last(AstNode node, Completion c) {
       super.last(node, c)
       or
-      last(this.getPat(), node, c) and
-      c.(MatchCompletion).failed()
+      last(this.getPat(), node, c) and c.(MatchCompletion).failed()
     }
 
     override predicate succ(AstNode pred, AstNode succ, Completion c) {
-      super.succ(pred, succ, c) and
-      not (succ = this and c.(MatchCompletion).failed())
+      super.succ(pred, succ, c) and c.(MatchCompletion).succeeded()
     }
   }
 
@@ -705,6 +673,14 @@ module PatternTrees {
 
   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 {
diff --git a/rust/ql/lib/codeql/rust/controlflow/internal/Scope.qll b/rust/ql/lib/codeql/rust/controlflow/internal/Scope.qll
index da4e153597d..48b730cb7fc 100644
--- a/rust/ql/lib/codeql/rust/controlflow/internal/Scope.qll
+++ b/rust/ql/lib/codeql/rust/controlflow/internal/Scope.qll
@@ -3,51 +3,24 @@ private import Completion
 private import ControlFlowGraphImpl
 private import codeql.rust.elements.internal.generated.ParentChild
 
-abstract class CfgScope extends AstNode {
-  /** Holds if `first` is executed first when entering scope. */
-  abstract predicate scopeFirst(AstNode first);
-
-  /** Holds if scope is exited when `last` finishes with completion `c`. */
-  abstract predicate scopeLast(AstNode last, Completion c);
-}
-
-final class FunctionScope extends CfgScope, Function {
-  override predicate scopeFirst(AstNode node) {
-    first(this.(FunctionTree).getFirstChildNode(), node)
-  }
-
-  override predicate scopeLast(AstNode node, Completion c) { last(this.getBody(), node, c) }
-}
-
-final class ClosureScope extends CfgScope, ClosureExpr {
-  override predicate scopeFirst(AstNode node) {
-    first(this.(ClosureExprTree).getFirstChildNode(), node)
-  }
-
-  override predicate scopeLast(AstNode node, Completion c) { last(this.getBody(), node, c) }
-}
-
 /**
- * Gets the immediate parent of a non-`AstNode` element `e`.
+ * A control-flow graph (CFG) scope.
  *
- * 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 is a callable with a body.
  */
-private Element getParentOfAstStep(Element e) {
-  not e instanceof AstNode and
-  result = getImmediateParent(e)
-}
+class CfgScope extends Callable {
+  CfgScope() {
+    // 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 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)
-  )
+  /** Gets the body of this callable. */
+  AstNode getBody() {
+    result = this.(Function).getBody()
+    or
+    result = this.(ClosureExpr).getBody()
+  }
 }
diff --git a/rust/ql/lib/codeql/rust/controlflow/internal/Splitting.qll b/rust/ql/lib/codeql/rust/controlflow/internal/Splitting.qll
index 3c59d6659c2..b40511d1ccb 100644
--- a/rust/ql/lib/codeql/rust/controlflow/internal/Splitting.qll
+++ b/rust/ql/lib/codeql/rust/controlflow/internal/Splitting.qll
@@ -4,8 +4,10 @@ private import Scope
 
 cached
 private module Cached {
+  private import codeql.rust.internal.CachedStages
+
   cached
-  newtype TSplitKind = TConditionalCompletionSplitKind()
+  newtype TSplitKind = TConditionalCompletionSplitKind() { Stages::CfgStage::ref() }
 
   cached
   newtype TSplit = TConditionalCompletionSplit(ConditionalCompletion c)
diff --git a/rust/ql/lib/codeql/rust/controlflow/internal/SuccessorType.qll b/rust/ql/lib/codeql/rust/controlflow/internal/SuccessorType.qll
index 0b88c9f05cb..658d2a66706 100644
--- a/rust/ql/lib/codeql/rust/controlflow/internal/SuccessorType.qll
+++ b/rust/ql/lib/codeql/rust/controlflow/internal/SuccessorType.qll
@@ -1,10 +1,11 @@
 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
@@ -18,7 +19,7 @@ abstract class SuccessorTypeImpl extends TSuccessorType {
 }
 
 /** A normal control flow successor. */
-class NormalSuccessorImpl extends SuccessorTypeImpl, TSuccessorSuccessor {
+class NormalSuccessorImpl extends SuccessorTypeImpl, TNormalSuccessor {
   override string toString() { result = "successor" }
 }
 
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/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..2f054afc66c
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/dataflow/internal/DataFlowImpl.qll
@@ -0,0 +1,308 @@
+/**
+ * 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 codeql.rust.controlflow.ControlFlowGraph
+private import codeql.rust.dataflow.Ssa
+
+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 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 string toString() { result = "N/A" }
+
+    override Location getLocation() { none() }
+  }
+
+  /**
+   * The value of a parameter at function entry, viewed as a node in a data
+   * flow graph.
+   */
+  final class ParameterNode extends Node {
+    Param param;
+
+    ParameterNode() { this = TSourceParameterNode(param) }
+
+    override Location getLocation() { result = param.getLocation() }
+
+    override string toString() { result = param.toString() }
+  }
+
+  final class ArgumentNode = NaNode;
+
+  final class ReturnNode extends NaNode {
+    RustDataFlow::ReturnKind getKind() { none() }
+  }
+
+  final class OutNode = NaNode;
+
+  /**
+   * 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;
+}
+
+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) { none() }
+
+  DataFlowType getNodeType(Node node) { none() }
+
+  predicate nodeIsHidden(Node node) { none() }
+
+  class DataFlowExpr = Void;
+
+  /** Gets the node corresponding to `e`. */
+  Node exprNode(DataFlowExpr e) { none() }
+
+  final class DataFlowCall extends TNormalCall {
+    private CallExpr c;
+
+    DataFlowCall() { this = TNormalCall(c) }
+
+    DataFlowCallable getEnclosingCallable() { none() }
+
+    string toString() { result = c.toString() }
+
+    Location getLocation() { result = c.getLocation() }
+  }
+
+  final class DataFlowCallable = CfgScope;
+
+  final class ReturnKind = Void;
+
+  /** Gets a viable implementation of the target of the given `Call`. */
+  DataFlowCallable viableCallable(DataFlowCall c) { none() }
+
+  OutNode getAnOutNode(DataFlowCall call, ReturnKind kind) { none() }
+
+  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 node1, Node node2, string model) { none() }
+
+  /**
+   * 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) { none() }
+
+  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(CfgNode n, Expr e) { n.getAstNode() = e } or
+    TSourceParameterNode(Param param)
+
+  cached
+  newtype TDataFlowCall = TNormalCall(CallExpr c)
+
+  cached
+  newtype TOptionalContentSet =
+    TAnyElementContent() or
+    TAnyContent()
+
+  cached
+  class TContentSet = TAnyElementContent or TAnyContent;
+
+  /** This is the local flow predicate that is exposed. */
+  cached
+  predicate localFlowStepImpl(Node::Node nodeFrom, Node::Node nodeTo) { none() }
+}
+
+import Cached
diff --git a/rust/ql/lib/codeql/rust/dataflow/internal/SsaImpl.qll b/rust/ql/lib/codeql/rust/dataflow/internal/SsaImpl.qll
index cbd638384d8..c6abd52a3a5 100644
--- a/rust/ql/lib/codeql/rust/dataflow/internal/SsaImpl.qll
+++ b/rust/ql/lib/codeql/rust/dataflow/internal/SsaImpl.qll
@@ -49,24 +49,20 @@ module SsaInput implements SsaImplCommon::InputSig<Location> {
   /**
    * A variable amenable to SSA construction.
    *
-   * All immutable variables are amenable. Mutable variables are restricted
-   * to those that are not captured by closures, and are not borrowed
-   * (either explicitly using `& mut`, or (potentially) implicit as borrowed
-   * receivers in a method call).
+   * 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.isImmutable()
-      or
-      this.isMutable() and
-      not this.isCaptured() and
-      forall(VariableAccess va | va = this.getAnAccess() |
-        va instanceof VariableReadAccess and
+      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
-        not va = any(MethodCallExpr mce).getReceiver()
-        or
-        variableWrite(va, this)
+        va = any(MethodCallExpr mce).getReceiver()
       )
     }
   }
@@ -78,6 +74,8 @@ module SsaInput implements SsaImplCommon::InputSig<Location> {
       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) {
@@ -102,6 +100,10 @@ module SsaInput implements SsaImplCommon::InputSig<Location> {
       v = va.getVariable() and
       certain = false
     )
+    or
+    capturedCallRead(_, bb, i, v) and certain = false
+    or
+    capturedExitRead(bb, i, v) and certain = false
   }
 }
 
@@ -147,6 +149,35 @@ private predicate variableReadActual(BasicBlock bb, int i, Variable v) {
   )
 }
 
+/**
+ * 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.getEnclosingCallable+())
+      .isCapture()
+}
+
+/**
+ * Holds if `v` is read inside basic block `bb` at index `i`, which is in the
+ * immediate outer 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.getEnclosingCallable()
+}
+
+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
 ) {
@@ -207,16 +238,81 @@ private predicate lastRefSkipUncertainReadsExt(DefinitionExt def, BasicBlock bb,
   )
 }
 
-/** Holds if `bb` contains a captured access to variable `v`. */
+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 hasCapturedVariableAccess(BasicBlock bb, Variable v) {
-  exists(VariableAccess read |
-    read = bb.getANode().getAstNode() and
-    read.isCapture() and
-    read.getVariable() = v
+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.getEnclosingCallable+())
+      .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.getEnclosingCallable() = bb.getScope()
+}
+
+/**
+ * Holds if the call `call` at index `i` in basic block `bb` may reach
+ * a callable that reads captured variable `v`.
+ */
+private predicate capturedCallRead(CallExprBase call, BasicBlock bb, int i, Variable v) {
+  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(CallExprBase call, BasicBlock bb, int i, Variable v) {
+  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 {
   /**
@@ -225,7 +321,7 @@ private module Cached {
    */
   cached
   predicate capturedEntryWrite(EntryBasicBlock bb, int i, Variable v) {
-    hasCapturedVariableAccess(bb.getASuccessor*(), v) and
+    readsCapturedVariable(bb.getASuccessor*(), v) and
     i = -1
   }
 
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 c39b6b39728..10411df5a79 100644
--- a/rust/ql/lib/codeql/rust/elements.qll
+++ b/rust/ql/lib/codeql/rust/elements.qll
@@ -21,6 +21,7 @@ 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
@@ -44,8 +45,11 @@ 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
@@ -99,6 +103,7 @@ 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
diff --git a/rust/ql/lib/codeql/rust/elements/AssocItemList.qll b/rust/ql/lib/codeql/rust/elements/AssocItemList.qll
index f71a004af72..63f568e1c25 100644
--- a/rust/ql/lib/codeql/rust/elements/AssocItemList.qll
+++ b/rust/ql/lib/codeql/rust/elements/AssocItemList.qll
@@ -9,9 +9,6 @@ import codeql.rust.elements.AstNode
 import codeql.rust.elements.Attr
 
 /**
- * A AssocItemList. For example:
- * ```rust
- * todo!()
- * ```
+ * 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/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/ClosureExpr.qll b/rust/ql/lib/codeql/rust/elements/ClosureExpr.qll
index 9dee274c4a3..cfcf18e48b2 100644
--- a/rust/ql/lib/codeql/rust/elements/ClosureExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/ClosureExpr.qll
@@ -4,10 +4,9 @@
  */
 
 private import internal.ClosureExprImpl
-import codeql.rust.elements.Attr
+import codeql.rust.elements.Callable
 import codeql.rust.elements.ClosureBinder
 import codeql.rust.elements.Expr
-import codeql.rust.elements.ParamList
 import codeql.rust.elements.RetType
 
 /**
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/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 0c1ea3b1652..2557429f60f 100644
--- a/rust/ql/lib/codeql/rust/elements/Function.qll
+++ b/rust/ql/lib/codeql/rust/elements/Function.qll
@@ -6,13 +6,12 @@
 private import internal.FunctionImpl
 import codeql.rust.elements.Abi
 import codeql.rust.elements.AssocItem
-import codeql.rust.elements.Attr
 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.ParamList
 import codeql.rust.elements.RetType
 import codeql.rust.elements.Visibility
 import codeql.rust.elements.WhereClause
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/PathExpr.qll b/rust/ql/lib/codeql/rust/elements/PathExpr.qll
index 7bbccd89a63..e1bf10488e3 100644
--- a/rust/ql/lib/codeql/rust/elements/PathExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/PathExpr.qll
@@ -5,8 +5,8 @@
 
 private import internal.PathExprImpl
 import codeql.rust.elements.Attr
-import codeql.rust.elements.Expr
 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/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/Trait.qll b/rust/ql/lib/codeql/rust/elements/Trait.qll
index 377b9a1bce2..ee1166922cc 100644
--- a/rust/ql/lib/codeql/rust/elements/Trait.qll
+++ b/rust/ql/lib/codeql/rust/elements/Trait.qll
@@ -15,8 +15,14 @@ import codeql.rust.elements.WhereClause
 
 /**
  * A Trait. For example:
- * ```rust
- * todo!()
+ * ```
+ * 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/internal/AssocItemListImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/AssocItemListImpl.qll
index 4ec980ac4d4..9cefb4cd2dd 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/AssocItemListImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/AssocItemListImpl.qll
@@ -13,10 +13,7 @@ private import codeql.rust.elements.internal.generated.AssocItemList
  */
 module Impl {
   /**
-   * A AssocItemList. For example:
-   * ```rust
-   * todo!()
-   * ```
+   * 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/AstNodeImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/AstNodeImpl.qll
index d92914d54b5..b3dd5670603 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`.
  *
@@ -12,5 +11,44 @@ private import codeql.rust.elements.internal.generated.AstNode
  * 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()
+      )
+    }
+
+    /** 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/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/FormatArgsExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/FormatArgsExprImpl.qll
index 0cf47a9ed1f..667439777b1 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/FormatArgsExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/FormatArgsExprImpl.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 `FormatArgsExpr`.
  *
@@ -6,17 +5,27 @@
  */
 
 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 { }
+  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/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/MatchExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/MatchExprImpl.qll
index f707a27afd4..c8cb535b526 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/MatchExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/MatchExprImpl.qll
@@ -31,6 +31,7 @@ module Impl {
     /**
      * Gets the `index`th arm of this match expression.
      */
+    pragma[nomagic]
     MatchArm getArm(int index) { result = this.getMatchArmList().getArm(index) }
 
     /**
@@ -41,6 +42,7 @@ module Impl {
     /**
      * Gets the number of arms of this match expression.
      */
+    pragma[nomagic]
     int getNumberOfArms() { result = this.getMatchArmList().getNumberOfArms() }
 
     /**
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/TraitImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/TraitImpl.qll
index 850224743da..a6fa19517f4 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/TraitImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/TraitImpl.qll
@@ -14,8 +14,14 @@ private import codeql.rust.elements.internal.generated.Trait
 module Impl {
   /**
    * A Trait. For example:
-   * ```rust
-   * todo!()
+   * ```
+   * 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/VariableImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/VariableImpl.qll
index 2895a33d94b..f862ec2cef1 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/VariableImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/VariableImpl.qll
@@ -1,6 +1,7 @@
 private import rust
 private import codeql.rust.elements.internal.generated.ParentChild
-private import codeql.rust.elements.internal.PathExprImpl::Impl as PathExprImpl
+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 {
@@ -83,7 +84,10 @@ module Impl {
     // 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()
+    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)
   }
 
   /** A variable. */
@@ -138,12 +142,12 @@ module Impl {
   }
 
   /** A path expression that may access a local variable. */
-  private class VariableAccessCand extends PathExpr {
+  private class VariableAccessCand extends PathExprBase {
     string name_;
 
     VariableAccessCand() {
       exists(Path p, PathSegment ps |
-        p = this.getPath() and
+        p = this.(PathExpr).getPath() and
         not p.hasQualifier() and
         ps = p.getPart() and
         not ps.hasGenericArgList() and
@@ -152,8 +156,12 @@ module Impl {
         not ps.hasReturnTypeSyntax() and
         name_ = ps.getNameRef().getText()
       )
+      or
+      this.(FormatTemplateVariableAccess).getName() = name_
     }
 
+    string toString() { result = name_ }
+
     string getName() { result = name_ }
   }
 
@@ -164,7 +172,10 @@ module Impl {
       n instanceof LetStmt or
       n instanceof VariableScope
     ) and
-    exists(AstNode n0 | result = getImmediateParent(n0) |
+    exists(AstNode n0 |
+      result = getImmediateParent(n0) or
+      result = n0.(FormatTemplateVariableAccess).getArgument().getParent().getParent()
+    |
       n0 = n
       or
       n0 = getAnAncestorInVariableScope(n) and
@@ -218,13 +229,13 @@ module Impl {
     name = v.getName() and
     (
       parameterDeclInScope(_, v, scope) and
-      scope.getLocation().hasLocationInfo(_, line, column, _, _)
+      scope.getLocation().hasLocationFileInfo(_, line, column, _, _)
       or
       exists(Pat pat | pat = getAVariablePatAncestor(v) |
         scope =
           any(MatchArmScope arm |
             arm.getPat() = pat and
-            arm.getLocation().hasLocationInfo(_, line, column, _, _)
+            arm.getLocation().hasLocationFileInfo(_, line, column, _, _)
           )
         or
         exists(LetStmt let |
@@ -232,27 +243,27 @@ module Impl {
           scope = getEnclosingScope(let) and
           // for `let` statements, variables are bound _after_ the statement, i.e.
           // not in the RHS
-          let.getLocation().hasLocationInfo(_, _, _, line, column)
+          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().hasLocationInfo(_, line, column, _, _)
+          scope.getLocation().hasLocationFileInfo(_, line, column, _, _)
         )
         or
         exists(ForExpr fe |
           fe.getPat() = pat and
           scope = fe.getLoopBody() and
-          scope.getLocation().hasLocationInfo(_, line, column, _, _)
+          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().hasLocationInfo(_, line, column, _, _)
+          scope.getLocation().hasLocationFileInfo(_, line, column, _, _)
         )
       )
     )
@@ -272,7 +283,7 @@ module Impl {
   ) {
     name = cand.getName() and
     scope = [cand.(VariableScope), getEnclosingScope(cand)] and
-    cand.getLocation().hasLocationInfo(_, startline, startcolumn, endline, endcolumn) and
+    cand.getLocation().hasLocationFileInfo(_, startline, startcolumn, endline, endcolumn) and
     nestLevel = 0
     or
     exists(VariableScope inner |
@@ -281,7 +292,7 @@ module Impl {
       // 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().hasLocationInfo(_, startline, startcolumn, endline, endcolumn)
+      inner.getLocation().hasLocationFileInfo(_, startline, startcolumn, endline, endcolumn)
     )
   }
 
@@ -421,10 +432,8 @@ module Impl {
     )
   }
 
-  private import codeql.rust.controlflow.internal.Scope
-
   /** A variable access. */
-  class VariableAccess extends PathExprImpl::PathExpr instanceof VariableAccessCand {
+  class VariableAccess extends PathExprBaseImpl::PathExprBase instanceof VariableAccessCand {
     private string name;
     private Variable v;
 
@@ -434,7 +443,7 @@ module Impl {
     Variable getVariable() { result = v }
 
     /** Holds if this access is a capture. */
-    predicate isCapture() { scopeOfAst(this) != scopeOfAst(v.getPat()) }
+    predicate isCapture() { this.getEnclosingCallable() != v.getPat().getEnclosingCallable() }
 
     override string toString() { result = name }
 
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/AssocItemList.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/AssocItemList.qll
index 9dac48242c3..4d6ab67d3d0 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/AssocItemList.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/AssocItemList.qll
@@ -16,10 +16,7 @@ import codeql.rust.elements.Attr
  */
 module Generated {
   /**
-   * A AssocItemList. For example:
-   * ```rust
-   * todo!()
-   * ```
+   * 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.
    */
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/ClosureExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ClosureExpr.qll
index 6538501d9a2..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,11 +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.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.ParamList
 import codeql.rust.elements.RetType
 
 /**
@@ -32,29 +31,9 @@ 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 attr of this closure expression (0-based).
-     */
-    Attr getAttr(int index) {
-      result =
-        Synth::convertAttrFromRaw(Synth::convertClosureExprToRaw(this)
-              .(Raw::ClosureExpr)
-              .getAttr(index))
-    }
-
-    /**
-     * Gets any of the attrs of this closure expression.
-     */
-    final Attr getAnAttr() { result = this.getAttr(_) }
-
-    /**
-     * Gets the number of attrs of this closure expression.
-     */
-    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
-
     /**
      * Gets the body of this closure expression, if it exists.
      */
@@ -108,21 +87,6 @@ module Generated {
      */
     predicate isStatic() { Synth::convertClosureExprToRaw(this).(Raw::ClosureExpr).isStatic() }
 
-    /**
-     * Gets the parameter list of this closure expression, if it exists.
-     */
-    ParamList getParamList() {
-      result =
-        Synth::convertParamListFromRaw(Synth::convertClosureExprToRaw(this)
-              .(Raw::ClosureExpr)
-              .getParamList())
-    }
-
-    /**
-     * Holds if `getParamList()` exists.
-     */
-    final predicate hasParamList() { exists(this.getParamList()) }
-
     /**
      * Gets the ret type of this closure expression, if it exists.
      */
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/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 4c4513d9e33..cc0179cb15b 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/Function.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Function.qll
@@ -8,13 +8,12 @@ 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.internal.AssocItemImpl::Impl as AssocItemImpl
-import codeql.rust.elements.Attr
 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.ParamList
 import codeql.rust.elements.RetType
 import codeql.rust.elements.Visibility
 import codeql.rust.elements.WhereClause
@@ -39,7 +38,7 @@ module Generated {
    * Use the subclass `Function`, where the following predicates are available.
    */
   class Function extends Synth::TFunction, AssocItemImpl::AssocItem, ExternItemImpl::ExternItem,
-    ItemImpl::Item
+    ItemImpl::Item, CallableImpl::Callable
   {
     override string getAPrimaryQlClass() { result = "Function" }
 
@@ -55,24 +54,6 @@ module Generated {
      */
     final predicate hasAbi() { exists(this.getAbi()) }
 
-    /**
-     * Gets the `index`th attr of this function (0-based).
-     */
-    Attr getAttr(int index) {
-      result =
-        Synth::convertAttrFromRaw(Synth::convertFunctionToRaw(this).(Raw::Function).getAttr(index))
-    }
-
-    /**
-     * Gets any of the attrs of this function.
-     */
-    final Attr getAnAttr() { result = this.getAttr(_) }
-
-    /**
-     * Gets the number of attrs of this function.
-     */
-    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
-
     /**
      * Gets the body of this function, if it exists.
      */
@@ -139,21 +120,6 @@ module Generated {
      */
     final predicate hasName() { exists(this.getName()) }
 
-    /**
-     * Gets the parameter list of this function, if it exists.
-     */
-    ParamList getParamList() {
-      result =
-        Synth::convertParamListFromRaw(Synth::convertFunctionToRaw(this)
-              .(Raw::Function)
-              .getParamList())
-    }
-
-    /**
-     * Holds if `getParamList()` exists.
-     */
-    final predicate hasParamList() { exists(this.getParamList()) }
-
     /**
      * Gets the ret type of this function, if it exists.
      */
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Item.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Item.qll
index a51bc363410..429221c7f18 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/Item.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Item.qll
@@ -21,5 +21,37 @@ module Generated {
    * INTERNAL: Do not reference the `Generated::Item` class directly.
    * Use the subclass `Item`, where the following predicates are available.
    */
-  class Item extends Synth::TItem, StmtImpl::Stmt { }
+  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/ParentChild.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ParentChild.qll
index 7eef4c18621..6264dc67420 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
@@ -163,6 +191,26 @@ private module Impl {
     )
   }
 
+  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
   ) {
@@ -1465,35 +1513,27 @@ private module Impl {
   private Element getImmediateChildOfClosureExpr(
     ClosureExpr e, int index, string partialPredicateCall
   ) {
-    exists(
-      int b, int bExpr, int n, int nAttr, int nBody, int nClosureBinder, int nParamList,
-      int nRetType
-    |
+    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
-      nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
-      nBody = nAttr + 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
-      nParamList = nClosureBinder + 1 and
-      nRetType = nParamList + 1 and
+      nRetType = nClosureBinder + 1 and
       (
         none()
         or
         result = getImmediateChildOfExpr(e, index - b, partialPredicateCall)
         or
-        result = e.getAttr(index - n) and
-        partialPredicateCall = "Attr(" + (index - n).toString() + ")"
+        result = getImmediateChildOfCallable(e, index - bExpr, partialPredicateCall)
         or
-        index = nAttr and result = e.getBody() and partialPredicateCall = "Body()"
+        index = n and result = e.getBody() and partialPredicateCall = "Body()"
         or
         index = nBody and result = e.getClosureBinder() and partialPredicateCall = "ClosureBinder()"
         or
-        index = nClosureBinder and
-        result = e.getParamList() and
-        partialPredicateCall = "ParamList()"
-        or
-        index = nParamList and result = e.getRetType() and partialPredicateCall = "RetType()"
+        index = nClosureBinder and result = e.getRetType() and partialPredicateCall = "RetType()"
       )
     )
   }
@@ -2202,22 +2242,17 @@ private module Impl {
     )
   }
 
-  private Element getImmediateChildOfPathExpr(PathExpr e, int index, string partialPredicateCall) {
-    exists(int b, int bExpr, int n, int nAttr, int nPath |
+  private Element getImmediateChildOfPathExprBase(
+    PathExprBase e, int index, string partialPredicateCall
+  ) {
+    exists(int b, int bExpr, int n |
       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
-      nPath = 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.getPath() and partialPredicateCall = "Path()"
       )
     )
   }
@@ -2928,25 +2963,40 @@ private module Impl {
     )
   }
 
+  private Element getImmediateChildOfFormatTemplateVariableAccess(
+    FormatTemplateVariableAccess e, int index, string partialPredicateCall
+  ) {
+    exists(int b, int bPathExprBase, int n |
+      b = 0 and
+      bPathExprBase =
+        b + 1 + max(int i | i = -1 or exists(getImmediateChildOfPathExprBase(e, i, _)) | i) and
+      n = bPathExprBase and
+      (
+        none()
+        or
+        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 n, int nAbi, int nAttr, int nBody,
-      int nGenericParamList, int nName, int nParamList, int nRetType, int nVisibility,
-      int nWhereClause
+      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
-      n = bItem and
+      bCallable =
+        bItem + 1 + max(int i | i = -1 or exists(getImmediateChildOfCallable(e, i, _)) | i) and
+      n = bCallable and
       nAbi = n + 1 and
-      nAttr = nAbi + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
-      nBody = nAttr + 1 and
+      nBody = nAbi + 1 and
       nGenericParamList = nBody + 1 and
       nName = nGenericParamList + 1 and
-      nParamList = nName + 1 and
-      nRetType = nParamList + 1 and
+      nRetType = nName + 1 and
       nVisibility = nRetType + 1 and
       nWhereClause = nVisibility + 1 and
       (
@@ -2958,12 +3008,11 @@ private module Impl {
         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
-        result = e.getAttr(index - nAbi) and
-        partialPredicateCall = "Attr(" + (index - nAbi).toString() + ")"
-        or
-        index = nAttr and result = e.getBody() and partialPredicateCall = "Body()"
+        index = nAbi and result = e.getBody() and partialPredicateCall = "Body()"
         or
         index = nBody and
         result = e.getGenericParamList() and
@@ -2971,9 +3020,7 @@ private module Impl {
         or
         index = nGenericParamList and result = e.getName() and partialPredicateCall = "Name()"
         or
-        index = nName and result = e.getParamList() and partialPredicateCall = "ParamList()"
-        or
-        index = nParamList and result = e.getRetType() and partialPredicateCall = "RetType()"
+        index = nName and result = e.getRetType() and partialPredicateCall = "RetType()"
         or
         index = nRetType and result = e.getVisibility() and partialPredicateCall = "Visibility()"
         or
@@ -3168,6 +3215,27 @@ private module Impl {
     )
   }
 
+  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,
@@ -3451,6 +3519,10 @@ 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)
@@ -3641,8 +3713,6 @@ private module Impl {
     or
     result = getImmediateChildOfParenType(e, index, partialAccessor)
     or
-    result = getImmediateChildOfPathExpr(e, index, partialAccessor)
-    or
     result = getImmediateChildOfPathPat(e, index, partialAccessor)
     or
     result = getImmediateChildOfPathType(e, index, partialAccessor)
@@ -3711,6 +3781,8 @@ private module Impl {
     or
     result = getImmediateChildOfExternCrate(e, index, partialAccessor)
     or
+    result = getImmediateChildOfFormatTemplateVariableAccess(e, index, partialAccessor)
+    or
     result = getImmediateChildOfFunction(e, index, partialAccessor)
     or
     result = getImmediateChildOfImpl(e, index, partialAccessor)
@@ -3725,6 +3797,8 @@ private module Impl {
     or
     result = getImmediateChildOfModule(e, index, partialAccessor)
     or
+    result = getImmediateChildOfPathExpr(e, index, partialAccessor)
+    or
     result = getImmediateChildOfStatic(e, index, partialAccessor)
     or
     result = getImmediateChildOfStruct(e, index, partialAccessor)
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 effd28fbd02..562747d0f11 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/PathExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/PathExpr.qll
@@ -7,8 +7,8 @@
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
 import codeql.rust.elements.Attr
-import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
 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
@@ -26,7 +26,7 @@ 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" }
 
     /**
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/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/Raw.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Raw.qll
index 032cb1e3d31..29be5f96117 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/Raw.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Raw.qll
@@ -88,10 +88,7 @@ module Raw {
 
   /**
    * INTERNAL: Do not use.
-   * A AssocItemList. For example:
-   * ```rust
-   * todo!()
-   * ```
+   * A list of  `AssocItem` elements, as appearing for example in a `Trait`.
    */
   class AssocItemList extends @assoc_item_list, AstNode {
     override string toString() { result = "AssocItemList" }
@@ -123,6 +120,22 @@ module Raw {
     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:
@@ -1541,14 +1554,9 @@ 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 attr of this closure expression (0-based).
-     */
-    Attr getAttr(int index) { closure_expr_attrs(this, index, result) }
-
     /**
      * Gets the body of this closure expression, if it exists.
      */
@@ -1584,11 +1592,6 @@ module Raw {
      */
     predicate isStatic() { closure_expr_is_static(this) }
 
-    /**
-     * Gets the parameter list of this closure expression, if it exists.
-     */
-    ParamList getParamList() { closure_expr_param_lists(this, result) }
-
     /**
      * Gets the ret type of this closure expression, if it exists.
      */
@@ -2055,7 +2058,23 @@ module Raw {
    * todo!()
    * ```
    */
-  class Item extends @item, Stmt { }
+  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) }
+  }
 
   /**
    * INTERNAL: Do not use.
@@ -2454,27 +2473,9 @@ module Raw {
 
   /**
    * 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;
-   * ```
+   * A path expression or a variable access in a formatting template. See `PathExpr` and `FormatTemplateVariableAccess` for further details.
    */
-  class PathExpr extends @path_expr, Expr {
-    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) }
-  }
+  class PathExprBase extends @path_expr_base, Expr { }
 
   /**
    * INTERNAL: Do not use.
@@ -3316,7 +3317,7 @@ module Raw {
    * }
    * ```
    */
-  class Function extends @function, AssocItem, ExternItem, Item {
+  class Function extends @function, AssocItem, ExternItem, Item, Callable {
     override string toString() { result = "Function" }
 
     /**
@@ -3324,11 +3325,6 @@ module Raw {
      */
     Abi getAbi() { function_abis(this, result) }
 
-    /**
-     * Gets the `index`th attr of this function (0-based).
-     */
-    Attr getAttr(int index) { function_attrs(this, index, result) }
-
     /**
      * Gets the body of this function, if it exists.
      */
@@ -3369,11 +3365,6 @@ module Raw {
      */
     Name getName() { function_names(this, result) }
 
-    /**
-     * Gets the parameter list of this function, if it exists.
-     */
-    ParamList getParamList() { function_param_lists(this, result) }
-
     /**
      * Gets the ret type of this function, if it exists.
      */
@@ -3612,6 +3603,30 @@ module Raw {
     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:
@@ -3702,8 +3717,14 @@ module Raw {
   /**
    * INTERNAL: Do not use.
    * A Trait. For example:
-   * ```rust
-   * todo!()
+   * ```
+   * 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 {
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 a6b0bd82c62..05b3fd5ece7 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/Synth.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Synth.qll
@@ -150,6 +150,12 @@ module Synth {
      * 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.
      */
@@ -158,6 +164,20 @@ module Synth {
      * 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.
      */
@@ -600,8 +620,8 @@ module Synth {
    * INTERNAL: Do not use.
    */
   class TAstNode =
-    TAbi or TArgList or TAssocItem or TAssocItemList or TAttr or TClosureBinder or TExpr or
-        TExternItem or TExternItemList or TFieldList or TFormatArgsArg or TGenericArg or
+    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 TPath or TPathSegment or
@@ -616,6 +636,11 @@ module Synth {
    */
   class TCallExprBase = TCallExpr or TMethodCallExpr;
 
+  /**
+   * INTERNAL: Do not use.
+   */
+  class TCallable = TClosureExpr or TFunction;
+
   /**
    * INTERNAL: Do not use.
    */
@@ -623,7 +648,7 @@ module Synth {
     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 TPathExpr 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;
 
@@ -658,7 +683,7 @@ module Synth {
   /**
    * INTERNAL: Do not use.
    */
-  class TLocatable = TAstNode;
+  class TLocatable = TAstNode or TFormat or TFormatArgument;
 
   /**
    * INTERNAL: Do not use.
@@ -668,6 +693,11 @@ module Synth {
         TPathPat or TRangePat or TRecordPat or TRefPat or TRestPat or TSlicePat or TTuplePat or
         TTupleStructPat or TWildcardPat;
 
+  /**
+   * INTERNAL: Do not use.
+   */
+  class TPathExprBase = TFormatTemplateVariableAccess or TPathExpr;
+
   /**
    * INTERNAL: Do not use.
    */
@@ -895,6 +925,12 @@ module Synth {
    */
   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.
@@ -907,6 +943,20 @@ module Synth {
    */
   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.
@@ -1588,6 +1638,8 @@ module Synth {
     or
     result = convertAttrFromRaw(e)
     or
+    result = convertCallableFromRaw(e)
+    or
     result = convertClosureBinderFromRaw(e)
     or
     result = convertExprFromRaw(e)
@@ -1703,6 +1755,16 @@ module Synth {
     result = convertMethodCallExprFromRaw(e)
   }
 
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw DB element to a synthesized `TCallable`, if possible.
+   */
+  TCallable convertCallableFromRaw(Raw::Element e) {
+    result = convertClosureExprFromRaw(e)
+    or
+    result = convertFunctionFromRaw(e)
+  }
+
   /**
    * INTERNAL: Do not use.
    * Converts a raw DB element to a synthesized `TElement`, if possible.
@@ -1764,7 +1826,7 @@ module Synth {
     or
     result = convertParenExprFromRaw(e)
     or
-    result = convertPathExprFromRaw(e)
+    result = convertPathExprBaseFromRaw(e)
     or
     result = convertPrefixExprFromRaw(e)
     or
@@ -1883,7 +1945,13 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw DB element to a synthesized `TLocatable`, if possible.
    */
-  TLocatable convertLocatableFromRaw(Raw::Element e) { result = convertAstNodeFromRaw(e) }
+  TLocatable convertLocatableFromRaw(Raw::Element e) {
+    result = convertAstNodeFromRaw(e)
+    or
+    result = convertFormatFromRaw(e)
+    or
+    result = convertFormatArgumentFromRaw(e)
+  }
 
   /**
    * INTERNAL: Do not use.
@@ -1923,6 +1991,16 @@ 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 `TStmt`, if possible.
@@ -2189,6 +2267,12 @@ module Synth {
    */
   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.
@@ -2201,6 +2285,18 @@ module Synth {
    */
   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.
@@ -2882,6 +2978,8 @@ module Synth {
     or
     result = convertAttrToRaw(e)
     or
+    result = convertCallableToRaw(e)
+    or
     result = convertClosureBinderToRaw(e)
     or
     result = convertExprToRaw(e)
@@ -2997,6 +3095,16 @@ module Synth {
     result = convertMethodCallExprToRaw(e)
   }
 
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TCallable` to a raw DB element, if possible.
+   */
+  Raw::Element convertCallableToRaw(TCallable e) {
+    result = convertClosureExprToRaw(e)
+    or
+    result = convertFunctionToRaw(e)
+  }
+
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TElement` to a raw DB element, if possible.
@@ -3058,7 +3166,7 @@ module Synth {
     or
     result = convertParenExprToRaw(e)
     or
-    result = convertPathExprToRaw(e)
+    result = convertPathExprBaseToRaw(e)
     or
     result = convertPrefixExprToRaw(e)
     or
@@ -3177,7 +3285,13 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TLocatable` to a raw DB element, if possible.
    */
-  Raw::Element convertLocatableToRaw(TLocatable e) { result = convertAstNodeToRaw(e) }
+  Raw::Element convertLocatableToRaw(TLocatable e) {
+    result = convertAstNodeToRaw(e)
+    or
+    result = convertFormatToRaw(e)
+    or
+    result = convertFormatArgumentToRaw(e)
+  }
 
   /**
    * INTERNAL: Do not use.
@@ -3217,6 +3331,16 @@ 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 `TStmt` to a raw DB element, if possible.
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/SynthConstructors.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/SynthConstructors.qll
index 3d02f199e78..9b68c858c6a 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/SynthConstructors.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/SynthConstructors.qll
@@ -37,8 +37,11 @@ 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
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Trait.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Trait.qll
index acbcb1e2e24..fff0363a3c7 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/Trait.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Trait.qll
@@ -22,8 +22,14 @@ import codeql.rust.elements.WhereClause
 module Generated {
   /**
    * A Trait. For example:
-   * ```rust
-   * todo!()
+   * ```
+   * 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.
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/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 100%
rename from rust/ql/src/queries/ide-contextual-queries/printAst.ql
rename to rust/ql/lib/ide-contextual-queries/printAst.ql
diff --git a/rust/ql/lib/rust.dbscheme b/rust/ql/lib/rust.dbscheme
index d5037a496aa..d5d61e69a94 100644
--- a/rust/ql/lib/rust.dbscheme
+++ b/rust/ql/lib/rust.dbscheme
@@ -139,6 +139,7 @@ locatable_locations(
 | @assoc_item
 | @assoc_item_list
 | @attr
+| @callable
 | @closure_binder
 | @expr
 | @extern_item
@@ -257,6 +258,24 @@ attr_meta(
   int meta: @meta ref
 );
 
+@callable =
+  @closure_expr
+| @function
+;
+
+#keyset[id]
+callable_param_lists(
+  int id: @callable ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id, index]
+callable_attrs(
+  int id: @callable ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
 closure_binders(
   unique int id: @closure_binder
 );
@@ -291,7 +310,7 @@ closure_binder_generic_param_lists(
 | @match_expr
 | @offset_of_expr
 | @paren_expr
-| @path_expr
+| @path_expr_base
 | @prefix_expr
 | @range_expr
 | @record_expr
@@ -1425,13 +1444,6 @@ closure_exprs(
   unique int id: @closure_expr
 );
 
-#keyset[id, index]
-closure_expr_attrs(
-  int id: @closure_expr ref,
-  int index: int ref,
-  int attr: @attr ref
-);
-
 #keyset[id]
 closure_expr_bodies(
   int id: @closure_expr ref,
@@ -1469,12 +1481,6 @@ closure_expr_is_static(
   int id: @closure_expr ref
 );
 
-#keyset[id]
-closure_expr_param_lists(
-  int id: @closure_expr ref,
-  int param_list: @param_list ref
-);
-
 #keyset[id]
 closure_expr_ret_types(
   int id: @closure_expr ref,
@@ -1837,6 +1843,18 @@ infer_types(
 | @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
 );
@@ -2107,22 +2125,9 @@ paren_type_ties(
   int ty: @type_ref 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
-);
+@path_expr_base =
+  @path_expr
+;
 
 path_pats(
   unique int id: @path_pat
@@ -2763,13 +2768,6 @@ function_abis(
   int abi: @abi ref
 );
 
-#keyset[id, index]
-function_attrs(
-  int id: @function ref,
-  int index: int ref,
-  int attr: @attr ref
-);
-
 #keyset[id]
 function_bodies(
   int id: @function ref,
@@ -2813,12 +2811,6 @@ function_names(
   int name: @name ref
 );
 
-#keyset[id]
-function_param_lists(
-  int id: @function ref,
-  int param_list: @param_list ref
-);
-
 #keyset[id]
 function_ret_types(
   int id: @function ref,
@@ -3043,6 +3035,23 @@ module_visibilities(
   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
 );
diff --git a/rust/ql/lib/rust.qll b/rust/ql/lib/rust.qll
index 58425b6490e..c61e177883e 100644
--- a/rust/ql/lib/rust.qll
+++ b/rust/ql/lib/rust.qll
@@ -6,3 +6,5 @@ import codeql.files.FileSystem
 import codeql.rust.elements.AssignmentOperation
 import codeql.rust.elements.LogicalOperation
 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/summary/Stats.qll b/rust/ql/src/queries/summary/Stats.qll
index 2f3992303f3..69453f68fff 100644
--- a/rust/ql/src/queries/summary/Stats.qll
+++ b/rust/ql/src/queries/summary/Stats.qll
@@ -3,9 +3,31 @@
  */
 
 import rust
+import codeql.rust.AstConsistency as AstConsistency
+private import codeql.rust.controlflow.internal.CfgConsistency as CfgConsistency
 
+/**
+ * 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))
+}
diff --git a/rust/ql/src/queries/summary/SummaryStats.ql b/rust/ql/src/queries/summary/SummaryStats.ql
index a3494ccb769..d16e229b4dd 100644
--- a/rust/ql/src/queries/summary/SummaryStats.ql
+++ b/rust/ql/src/queries/summary/SummaryStats.ql
@@ -1,7 +1,7 @@
 /**
  * @name Summary Statistics
  * @description A table of summary statistics about a database.
- * @kind table
+ * @kind metric
  * @id rust/summary/summary-statistics
  * @tags summary
  */
@@ -10,27 +10,29 @@ import rust
 import codeql.rust.Diagnostics
 import Stats
 
-from string key, string value
+from string key, int value
 where
-  key = "Elements extracted" and value = count(Element e | not e instanceof Unextracted).toString()
+  key = "Elements extracted" and value = count(Element e | not e instanceof Unextracted)
   or
-  key = "Elements unextracted" and value = count(Unextracted e).toString()
+  key = "Elements unextracted" and value = count(Unextracted e)
   or
-  key = "Extraction errors" and value = count(ExtractionError e).toString()
+  key = "Extraction errors" and value = count(ExtractionError e)
   or
-  key = "Extraction warnings" and value = count(ExtractionWarning w).toString()
+  key = "Extraction warnings" and value = count(ExtractionWarning w)
   or
-  key = "Files extracted - total" and value = count(File f | exists(f.getRelativePath())).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)
-        .toString()
+  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())).toString()
+  value = count(SuccessfullyExtractedFile f | exists(f.getRelativePath()))
   or
-  key = "Lines of code extracted" and value = getLinesOfCode().toString()
+  key = "Lines of code extracted" and value = getLinesOfCode()
   or
-  key = "Lines of user code extracted" and value = getLinesOfUserCode().toString()
+  key = "Lines of user code extracted" and value = getLinesOfUserCode()
+  or
+  key = "Inconsistencies - AST" and value = getTotalAstInconsistencies()
+  or
+  key = "Inconsistencies - CFG" and value = getTotalCfgInconsistencies()
 select key, value
diff --git a/rust/ql/src/queries/unusedentities/UnreachableCode.ql b/rust/ql/src/queries/unusedentities/UnreachableCode.ql
index f07ab0f982a..aa49c30ce5a 100644
--- a/rust/ql/src/queries/unusedentities/UnreachableCode.ql
+++ b/rust/ql/src/queries/unusedentities/UnreachableCode.ql
@@ -13,63 +13,65 @@ import codeql.rust.controlflow.ControlFlowGraph
 import codeql.rust.controlflow.internal.ControlFlowGraphImpl as ControlFlowGraphImpl
 
 /**
- * Holds if `n` is an AST node that's unreachable.
+ * Successor relation that includes unreachable AST nodes.
  */
-private predicate unreachable(AstNode n) {
-  not n = any(CfgNode cfn).getAstNode() and // reachable nodes
-  exists(ControlFlowGraphImpl::ControlFlowTree cft |
-    // nodes intended to be part of the CFG
-    cft.succ(n, _, _)
-    or
-    cft.succ(_, n, _)
+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)
   )
 }
 
 /**
- * Holds if `n` is an AST node that's unreachable, and is not the successor
- * of an unreachable node (which would be a duplicate result).
+ * 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) {
-  unreachable(n) and
-  (
-    // no predecessor -> we are the first unreachable node.
-    not ControlFlowGraphImpl::succ(_, n, _)
-    or
-    // reachable predecessor -> we are the first unreachable node.
-    exists(AstNode pred |
-      ControlFlowGraphImpl::succ(pred, n, _) and
-      not unreachable(pred)
-    )
-  )
+  not reachable(n) and
+  not hiddenNode(n) and
+  forall(AstNode pred | succWithHiding(pred, n) | reachable(pred))
 }
 
-/**
- * Gets a node we'd prefer not to report as unreachable.
- */
-predicate skipNode(AstNode n) {
-  n instanceof ControlFlowGraphImpl::PostOrderTree or // location is counter-intuitive
-  not n instanceof ControlFlowGraphImpl::ControlFlowTree // not expected to be reachable
-}
-
-/**
- * Gets the `ControlFlowTree` successor of a node we'd prefer not to report.
- */
-AstNode skipSuccessor(AstNode n) {
-  skipNode(n) and
-  ControlFlowGraphImpl::succ(n, result, _)
-}
-
-/**
- * Gets the node `n`, skipping past any nodes we'd prefer not to report.
- */
-AstNode skipSuccessors(AstNode n) {
-  result = skipSuccessor*(n) and
-  not skipNode(result)
-}
-
-from AstNode first, AstNode report
+from AstNode n
 where
-  firstUnreachable(first) and
-  report = skipSuccessors(first) and
-  exists(report.getFile().getRelativePath()) // in source
-select report, "This code is never reached."
+  firstUnreachable(n) and
+  exists(n.getFile().getRelativePath()) // in source
+select n, "This code is never reached."
diff --git a/rust/ql/src/queries/unusedentities/UnusedValue.ql b/rust/ql/src/queries/unusedentities/UnusedValue.ql
index a2241369682..32b54fc7442 100644
--- a/rust/ql/src/queries/unusedentities/UnusedValue.ql
+++ b/rust/ql/src/queries/unusedentities/UnusedValue.ql
@@ -9,7 +9,17 @@
  */
 
 import rust
+import codeql.rust.dataflow.Ssa
+import codeql.rust.dataflow.internal.SsaImpl
+import UnusedVariable
 
-from Locatable e
-where none() // TODO: implement query
-select e, "Variable is assigned a value that is never used."
+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/UnusedVariable.ql b/rust/ql/src/queries/unusedentities/UnusedVariable.ql
index f6be18b76e1..339bb0967fb 100644
--- a/rust/ql/src/queries/unusedentities/UnusedVariable.ql
+++ b/rust/ql/src/queries/unusedentities/UnusedVariable.ql
@@ -9,11 +9,8 @@
  */
 
 import rust
+import UnusedVariable
 
 from Variable v
-where
-  not exists(v.getAnAccess()) and
-  not exists(v.getInitializer()) and
-  not v.getName().charAt(0) = "_" and
-  exists(File f | f.getBaseName() = "main.rs" | v.getLocation().getFile() = f) // temporarily severely limit results
-select v, "Variable is not used."
+where isUnused(v)
+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..e52b836823b
--- /dev/null
+++ b/rust/ql/src/queries/unusedentities/UnusedVariable.qll
@@ -0,0 +1,15 @@
+import rust
+
+/** A deliberately unused variable. */
+class DiscardVariable extends Variable {
+  DiscardVariable() { this.getName().charAt(0) = "_" }
+}
+
+/** Holds if variable `v` is unused. */
+predicate isUnused(Variable v) {
+  not exists(v.getAnAccess()) and
+  not exists(v.getInitializer()) and
+  not v instanceof DiscardVariable and
+  not v.getPat().isInMacroExpansion() and
+  exists(File f | f.getBaseName() = "main.rs" | v.getLocation().getFile() = f) // temporarily severely limit results
+}
diff --git a/rust/ql/test/extractor-tests/canonical_path/canonical_path.expected b/rust/ql/test/extractor-tests/canonical_path/canonical_path.expected
new file mode 100644
index 00000000000..abfa4a99802
--- /dev/null
+++ b/rust/ql/test/extractor-tests/canonical_path/canonical_path.expected
@@ -0,0 +1,28 @@
+| canonical_paths.rs:1:1:23:1 | Module | crate::canonical_paths::a |
+| canonical_paths.rs:2:5:2:22 | Struct | crate::canonical_paths::a::Struct |
+| canonical_paths.rs:4:5:6:5 | Trait | crate::canonical_paths::a::Trait |
+| canonical_paths.rs:5:9:5:20 | f | crate::canonical_paths::a::Trait::f |
+| canonical_paths.rs:8:5:10:5 | Impl | None |
+| canonical_paths.rs:9:9:9:22 | f | <crate::canonical_paths::a::Struct as crate::canonical_paths::a::Trait>::f |
+| canonical_paths.rs:12:5:14:5 | Impl | None |
+| canonical_paths.rs:13:9:13:22 | g | <crate::canonical_paths::a::Struct>::g |
+| canonical_paths.rs:16:5:18:5 | Trait | crate::canonical_paths::a::TraitWithBlanketImpl |
+| canonical_paths.rs:17:9:17:20 | h | crate::canonical_paths::a::TraitWithBlanketImpl::h |
+| canonical_paths.rs:20:5:22:5 | Impl | None |
+| canonical_paths.rs:21:9:21:22 | h | <_ as crate::canonical_paths::a::TraitWithBlanketImpl>::h |
+| canonical_paths.rs:25:1:53:1 | Module | crate::canonical_paths::without |
+| canonical_paths.rs:26:5:48:5 | canonicals | crate::canonical_paths::without::canonicals |
+| canonical_paths.rs:27:9:27:27 | Struct | {0}::OtherStruct |
+| canonical_paths.rs:29:9:31:9 | Trait | {0}::OtherTrait |
+| canonical_paths.rs:30:13:30:24 | g | {0}::OtherTrait::g |
+| canonical_paths.rs:33:9:35:9 | Impl | None |
+| canonical_paths.rs:34:13:34:26 | g | <{0}::OtherStruct as {0}::OtherTrait>::g |
+| canonical_paths.rs:37:9:39:9 | Impl | None |
+| canonical_paths.rs:38:13:38:26 | g | <crate::canonical_paths::a::Struct as {0}::OtherTrait>::g |
+| canonical_paths.rs:41:9:43:9 | Impl | None |
+| canonical_paths.rs:42:13:42:26 | f | <{0}::OtherStruct as crate::canonical_paths::a::Trait>::f |
+| canonical_paths.rs:45:9:47:9 | nested | {0}::nested |
+| canonical_paths.rs:46:13:46:31 | Struct | {1}::OtherStruct |
+| canonical_paths.rs:50:5:52:5 | other | crate::canonical_paths::without::other |
+| canonical_paths.rs:51:9:51:27 | Struct | {2}::OtherStruct |
+| lib.rs:1:1:1:20 | Module | crate::canonical_paths |
diff --git a/rust/ql/test/extractor-tests/canonical_path/canonical_path.ql b/rust/ql/test/extractor-tests/canonical_path/canonical_path.ql
new file mode 100644
index 00000000000..5548ba97773
--- /dev/null
+++ b/rust/ql/test/extractor-tests/canonical_path/canonical_path.ql
@@ -0,0 +1,12 @@
+import rust
+import TestUtils
+
+from Item i, string path
+where
+  toBeTested(i) and
+  (
+    path = i.getExtendedCanonicalPath()
+    or
+    not i.hasExtendedCanonicalPath() and path = "None"
+  )
+select i, path
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..39a5d8672b3
--- /dev/null
+++ b/rust/ql/test/extractor-tests/canonical_path/canonical_paths.rs
@@ -0,0 +1,53 @@
+mod a {
+    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) {}
+    }
+}
+
+mod without {
+    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 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 62b8447a136..b60779ebd86 100644
--- a/rust/ql/test/extractor-tests/generated/.generated_tests.list
+++ b/rust/ql/test/extractor-tests/generated/.generated_tests.list
@@ -3,7 +3,6 @@ ArgList/gen_arg_list.rs 569d0b9b0479de5453ae0f89e4f90e32b02ee84dfb3d815821d722ec
 ArrayExpr/gen_array_expr.rs e4863b428ea2b5cfd59773f201e58fd905f7363512e54e4fdebd02c297bd85ff e4863b428ea2b5cfd59773f201e58fd905f7363512e54e4fdebd02c297bd85ff
 ArrayType/gen_array_type.rs 3cb5f35006648d676ead1088aa330cd34beaabaaad7b9aa952e6375bc1cec5cb 3cb5f35006648d676ead1088aa330cd34beaabaaad7b9aa952e6375bc1cec5cb
 AsmExpr/gen_asm_expr.rs 00b21fd66fe12785174bd0160d0317a6c78ff05dbba73313eb07b56531cf3158 00b21fd66fe12785174bd0160d0317a6c78ff05dbba73313eb07b56531cf3158
-AssocItemList/gen_assoc_item_list.rs 78c835e9f031147eb4a39052db3e61b567a1d9149903dd865b2e343cdb2c8c1f 78c835e9f031147eb4a39052db3e61b567a1d9149903dd865b2e343cdb2c8c1f
 AssocTypeArg/gen_assoc_type_arg.rs 00ec0e22c4d73338de605dc3b1b1306bc83a95f87376ce976f08d2f9923cc2b4 00ec0e22c4d73338de605dc3b1b1306bc83a95f87376ce976f08d2f9923cc2b4
 Attr/gen_attr.rs cd6e50f5ebb17066209682b1a9f22ff116584ffef180d8ab51e2ba5cab6a91ec cd6e50f5ebb17066209682b1a9f22ff116584ffef180d8ab51e2ba5cab6a91ec
 AwaitExpr/gen_await_expr.rs cbfa17a0b84bb0033b1f577c1f2a7ff187506c6211faaf6d90c371d4186b9aa2 cbfa17a0b84bb0033b1f577c1f2a7ff187506c6211faaf6d90c371d4186b9aa2
@@ -112,7 +111,7 @@ Static/gen_static.rs ff01782c2f0f702373fc6df45ac9277fbdd8d4fad69dbe5f984a14790a4
 StmtList/gen_stmt_list.rs bb3791a613b91a2086c19cb0eddbf978bb37bbb2bd79d3e61b40be35c71daaad bb3791a613b91a2086c19cb0eddbf978bb37bbb2bd79d3e61b40be35c71daaad
 Struct/gen_struct.rs 09c5c164d7c8a3991fad1a118d66c12c24d2ebf30fbea6205f7690ca9f24dbb2 09c5c164d7c8a3991fad1a118d66c12c24d2ebf30fbea6205f7690ca9f24dbb2
 TokenTree/gen_token_tree.rs dde6595ee4e8f3fcdecfb054438b08e1a7db10d83d9fff121794df814c7aee0e dde6595ee4e8f3fcdecfb054438b08e1a7db10d83d9fff121794df814c7aee0e
-Trait/gen_trait.rs abef0d860253d9979d68c1e3051dd1de5d8b64a1575140dda1694e3516badba9 abef0d860253d9979d68c1e3051dd1de5d8b64a1575140dda1694e3516badba9
+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
diff --git a/rust/ql/test/extractor-tests/generated/.gitattributes b/rust/ql/test/extractor-tests/generated/.gitattributes
index 136801c1ce3..8ea3a00a31f 100644
--- a/rust/ql/test/extractor-tests/generated/.gitattributes
+++ b/rust/ql/test/extractor-tests/generated/.gitattributes
@@ -5,7 +5,6 @@
 /ArrayExpr/gen_array_expr.rs linguist-generated
 /ArrayType/gen_array_type.rs linguist-generated
 /AsmExpr/gen_asm_expr.rs linguist-generated
-/AssocItemList/gen_assoc_item_list.rs linguist-generated
 /AssocTypeArg/gen_assoc_type_arg.rs linguist-generated
 /Attr/gen_attr.rs linguist-generated
 /AwaitExpr/gen_await_expr.rs linguist-generated
diff --git a/rust/ql/test/extractor-tests/generated/Abi/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/extractor-tests/generated/Abi/CONSISTENCY/DataFlowConsistency.expected
new file mode 100644
index 00000000000..33a015c809c
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Abi/CONSISTENCY/DataFlowConsistency.expected
@@ -0,0 +1,2 @@
+uniqueCallEnclosingCallable
+| gen_abi.rs:5:5:5:11 | CallExpr | Call should have one enclosing callable but has 0. |
diff --git a/rust/ql/test/extractor-tests/generated/ArgList/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/extractor-tests/generated/ArgList/CONSISTENCY/DataFlowConsistency.expected
new file mode 100644
index 00000000000..5c931a7dfd5
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ArgList/CONSISTENCY/DataFlowConsistency.expected
@@ -0,0 +1,2 @@
+uniqueCallEnclosingCallable
+| gen_arg_list.rs:5:5:5:11 | CallExpr | Call should have one enclosing callable but has 0. |
diff --git a/rust/ql/test/extractor-tests/generated/ArrayType/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/extractor-tests/generated/ArrayType/CONSISTENCY/DataFlowConsistency.expected
new file mode 100644
index 00000000000..0b272615a03
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ArrayType/CONSISTENCY/DataFlowConsistency.expected
@@ -0,0 +1,2 @@
+uniqueCallEnclosingCallable
+| gen_array_type.rs:5:5:5:11 | CallExpr | Call should have one enclosing callable but has 0. |
diff --git a/rust/ql/test/extractor-tests/generated/AssocItemList/gen_assoc_item_list.rs b/rust/ql/test/extractor-tests/generated/AssocItemList/gen_assoc_item_list.rs
deleted file mode 100644
index b858bff4755..00000000000
--- a/rust/ql/test/extractor-tests/generated/AssocItemList/gen_assoc_item_list.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-// generated by codegen, do not edit
-
-fn test_assoc_item_list() -> () {
-    // A AssocItemList. For example:
-    todo!()
-}
diff --git a/rust/ql/test/extractor-tests/generated/AssocTypeArg/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/extractor-tests/generated/AssocTypeArg/CONSISTENCY/DataFlowConsistency.expected
new file mode 100644
index 00000000000..7e257e4f04e
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/AssocTypeArg/CONSISTENCY/DataFlowConsistency.expected
@@ -0,0 +1,2 @@
+uniqueCallEnclosingCallable
+| gen_assoc_type_arg.rs:5:5:5:11 | CallExpr | Call should have one enclosing callable but has 0. |
diff --git a/rust/ql/test/extractor-tests/generated/Attr/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/extractor-tests/generated/Attr/CONSISTENCY/DataFlowConsistency.expected
new file mode 100644
index 00000000000..f3bae512ec4
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Attr/CONSISTENCY/DataFlowConsistency.expected
@@ -0,0 +1,2 @@
+uniqueCallEnclosingCallable
+| gen_attr.rs:5:5:5:11 | CallExpr | Call should have one enclosing callable but has 0. |
diff --git a/rust/ql/test/extractor-tests/generated/AwaitExpr/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/extractor-tests/generated/AwaitExpr/CONSISTENCY/DataFlowConsistency.expected
new file mode 100644
index 00000000000..2efd6dd82ea
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/AwaitExpr/CONSISTENCY/DataFlowConsistency.expected
@@ -0,0 +1,2 @@
+uniqueCallEnclosingCallable
+| gen_await_expr.rs:6:17:6:21 | CallExpr | Call should have one enclosing callable but has 0. |
diff --git a/rust/ql/test/extractor-tests/generated/BecomeExpr/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/extractor-tests/generated/BecomeExpr/CONSISTENCY/DataFlowConsistency.expected
new file mode 100644
index 00000000000..4dcf3076e51
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/BecomeExpr/CONSISTENCY/DataFlowConsistency.expected
@@ -0,0 +1,8 @@
+uniqueEnclosingCallable
+| gen_become_expr.rs:4:11:4:16 | Param | Node should have one enclosing callable but has 0. |
+| gen_become_expr.rs:4:19:4:24 | Param | Node should have one enclosing callable but has 0. |
+uniqueCallEnclosingCallable
+| gen_become_expr.rs:8:17:8:36 | CallExpr | Call should have one enclosing callable but has 0. |
+uniqueType
+| gen_become_expr.rs:4:11:4:16 | Param | Node should have one type but has 0. |
+| gen_become_expr.rs:4:19:4:24 | Param | Node should have one type but has 0. |
diff --git a/rust/ql/test/extractor-tests/generated/BreakExpr/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/extractor-tests/generated/BreakExpr/CONSISTENCY/DataFlowConsistency.expected
new file mode 100644
index 00000000000..ca9901e23be
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/BreakExpr/CONSISTENCY/DataFlowConsistency.expected
@@ -0,0 +1,4 @@
+uniqueCallEnclosingCallable
+| gen_break_expr.rs:6:12:6:22 | CallExpr | Call should have one enclosing callable but has 0. |
+| gen_break_expr.rs:11:12:11:17 | CallExpr | Call should have one enclosing callable but has 0. |
+| gen_break_expr.rs:16:12:16:17 | CallExpr | Call should have one enclosing callable but has 0. |
diff --git a/rust/ql/test/extractor-tests/generated/CallExpr/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/extractor-tests/generated/CallExpr/CONSISTENCY/DataFlowConsistency.expected
new file mode 100644
index 00000000000..cc44ad8bfe2
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/CallExpr/CONSISTENCY/DataFlowConsistency.expected
@@ -0,0 +1,5 @@
+uniqueCallEnclosingCallable
+| gen_call_expr.rs:5:5:5:11 | CallExpr | Call should have one enclosing callable but has 0. |
+| gen_call_expr.rs:6:5:6:23 | CallExpr | Call should have one enclosing callable but has 0. |
+| gen_call_expr.rs:7:5:7:14 | CallExpr | Call should have one enclosing callable but has 0. |
+| gen_call_expr.rs:8:5:8:10 | CallExpr | Call should have one enclosing callable but has 0. |
diff --git a/rust/ql/test/extractor-tests/generated/ClosureBinder/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/extractor-tests/generated/ClosureBinder/CONSISTENCY/DataFlowConsistency.expected
new file mode 100644
index 00000000000..cdf204265b0
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ClosureBinder/CONSISTENCY/DataFlowConsistency.expected
@@ -0,0 +1,2 @@
+uniqueCallEnclosingCallable
+| gen_closure_binder.rs:5:5:5:11 | CallExpr | Call should have one enclosing callable but has 0. |
diff --git a/rust/ql/test/extractor-tests/generated/ClosureExpr/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/extractor-tests/generated/ClosureExpr/CONSISTENCY/DataFlowConsistency.expected
new file mode 100644
index 00000000000..43e5f60d4cb
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ClosureExpr/CONSISTENCY/DataFlowConsistency.expected
@@ -0,0 +1,14 @@
+uniqueEnclosingCallable
+| gen_closure_expr.rs:5:6:5:6 | Param | Node should have one enclosing callable but has 0. |
+| gen_closure_expr.rs:6:11:6:16 | Param | Node should have one enclosing callable but has 0. |
+| gen_closure_expr.rs:7:12:7:17 | Param | Node should have one enclosing callable but has 0. |
+| gen_closure_expr.rs:7:20:7:20 | Param | Node should have one enclosing callable but has 0. |
+| gen_closure_expr.rs:9:6:9:6 | Param | Node should have one enclosing callable but has 0. |
+| gen_closure_expr.rs:11:14:11:14 | Param | Node should have one enclosing callable but has 0. |
+uniqueType
+| gen_closure_expr.rs:5:6:5:6 | Param | Node should have one type but has 0. |
+| gen_closure_expr.rs:6:11:6:16 | Param | Node should have one type but has 0. |
+| gen_closure_expr.rs:7:12:7:17 | Param | Node should have one type but has 0. |
+| gen_closure_expr.rs:7:20:7:20 | Param | Node should have one type but has 0. |
+| gen_closure_expr.rs:9:6:9:6 | Param | Node should have one type but has 0. |
+| gen_closure_expr.rs:11:14:11:14 | Param | Node should have one type but has 0. |
diff --git a/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr.expected b/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr.expected
index 18fb8271629..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 | getNumberOfAttrs: | 0 | hasBody: | yes | hasClosureBinder: | no | isAsync: | no | isConst: | no | isGen: | no | isMove: | no | isStatic: | no | hasParamList: | yes | hasRetType: | no |
-| gen_closure_expr.rs:6:5:6:34 | ClosureExpr | getNumberOfAttrs: | 0 | hasBody: | yes | hasClosureBinder: | no | isAsync: | no | isConst: | no | isGen: | no | isMove: | yes | isStatic: | no | hasParamList: | yes | hasRetType: | yes |
-| gen_closure_expr.rs:7:5:7:27 | ClosureExpr | getNumberOfAttrs: | 0 | hasBody: | yes | hasClosureBinder: | no | isAsync: | yes | isConst: | no | isGen: | no | isMove: | no | isStatic: | no | hasParamList: | yes | hasRetType: | no |
-| gen_closure_expr.rs:8:6:9:15 | ClosureExpr | getNumberOfAttrs: | 1 | hasBody: | yes | hasClosureBinder: | no | isAsync: | no | isConst: | no | isGen: | no | isMove: | no | isStatic: | no | hasParamList: | yes | hasRetType: | no |
-| gen_closure_expr.rs:10:6:11:23 | ClosureExpr | getNumberOfAttrs: | 1 | hasBody: | yes | hasClosureBinder: | no | isAsync: | no | isConst: | no | isGen: | no | isMove: | no | isStatic: | yes | hasParamList: | yes | hasRetType: | 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 f55b0c78d22..b4b3dddc679 100644
--- a/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr.ql
+++ b/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr.ql
@@ -3,12 +3,12 @@ import codeql.rust.elements
 import TestUtils
 
 from
-  ClosureExpr x, int getNumberOfAttrs, string hasBody, string hasClosureBinder, string isAsync,
-  string isConst, string isGen, string isMove, string isStatic, string hasParamList,
-  string hasRetType
+  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
+  (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
@@ -17,8 +17,7 @@ where
   (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.hasParamList() then hasParamList = "yes" else hasParamList = "no") and
   if x.hasRetType() then hasRetType = "yes" else hasRetType = "no"
-select x, "getNumberOfAttrs:", getNumberOfAttrs, "hasBody:", hasBody, "hasClosureBinder:",
-  hasClosureBinder, "isAsync:", isAsync, "isConst:", isConst, "isGen:", isGen, "isMove:", isMove,
-  "isStatic:", isStatic, "hasParamList:", hasParamList, "hasRetType:", hasRetType
+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/Comment/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/extractor-tests/generated/Comment/CONSISTENCY/DataFlowConsistency.expected
new file mode 100644
index 00000000000..ad3d84671e2
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Comment/CONSISTENCY/DataFlowConsistency.expected
@@ -0,0 +1,2 @@
+uniqueCallEnclosingCallable
+| comments.rs:6:3:6:14 | CallExpr | Call should have one enclosing callable but has 0. |
diff --git a/rust/ql/test/extractor-tests/generated/Const/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/extractor-tests/generated/Const/CONSISTENCY/DataFlowConsistency.expected
new file mode 100644
index 00000000000..e7c6d013cc8
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Const/CONSISTENCY/DataFlowConsistency.expected
@@ -0,0 +1,2 @@
+uniqueCallEnclosingCallable
+| gen_const.rs:5:5:5:11 | CallExpr | Call should have one enclosing callable but has 0. |
diff --git a/rust/ql/test/extractor-tests/generated/Const/Const.ql b/rust/ql/test/extractor-tests/generated/Const/Const.ql
index a5def567f8c..125943f40a0 100644
--- a/rust/ql/test/extractor-tests/generated/Const/Const.ql
+++ b/rust/ql/test/extractor-tests/generated/Const/Const.ql
@@ -3,11 +3,18 @@ import codeql.rust.elements
 import TestUtils
 
 from
-  Const x, int getNumberOfAttrs, string hasBody, string isConst, string isDefault, string hasName,
-  string hasTy, string hasVisibility
+  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
@@ -15,5 +22,6 @@ where
   (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, "hasBody:", hasBody, "isConst:", isConst,
-  "isDefault:", isDefault, "hasName:", hasName, "hasTy:", hasTy, "hasVisibility:", hasVisibility
+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_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/ConstArg/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/extractor-tests/generated/ConstArg/CONSISTENCY/DataFlowConsistency.expected
new file mode 100644
index 00000000000..5414d21feb8
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ConstArg/CONSISTENCY/DataFlowConsistency.expected
@@ -0,0 +1,2 @@
+uniqueCallEnclosingCallable
+| gen_const_arg.rs:5:5:5:11 | CallExpr | Call should have one enclosing callable but has 0. |
diff --git a/rust/ql/test/extractor-tests/generated/ConstParam/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/extractor-tests/generated/ConstParam/CONSISTENCY/DataFlowConsistency.expected
new file mode 100644
index 00000000000..d83fd9a9dac
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ConstParam/CONSISTENCY/DataFlowConsistency.expected
@@ -0,0 +1,2 @@
+uniqueCallEnclosingCallable
+| gen_const_param.rs:5:5:5:11 | CallExpr | Call should have one enclosing callable but has 0. |
diff --git a/rust/ql/test/extractor-tests/generated/ContinueExpr/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/extractor-tests/generated/ContinueExpr/CONSISTENCY/DataFlowConsistency.expected
new file mode 100644
index 00000000000..ecb8d4c5fa5
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ContinueExpr/CONSISTENCY/DataFlowConsistency.expected
@@ -0,0 +1,3 @@
+uniqueCallEnclosingCallable
+| gen_continue_expr.rs:6:12:6:22 | CallExpr | Call should have one enclosing callable but has 0. |
+| gen_continue_expr.rs:11:12:11:22 | CallExpr | Call should have one enclosing callable but has 0. |
diff --git a/rust/ql/test/extractor-tests/generated/DynTraitType/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/extractor-tests/generated/DynTraitType/CONSISTENCY/DataFlowConsistency.expected
new file mode 100644
index 00000000000..b0e1d187596
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/DynTraitType/CONSISTENCY/DataFlowConsistency.expected
@@ -0,0 +1,2 @@
+uniqueCallEnclosingCallable
+| gen_dyn_trait_type.rs:5:5:5:11 | CallExpr | Call should have one enclosing callable but has 0. |
diff --git a/rust/ql/test/extractor-tests/generated/Enum/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/extractor-tests/generated/Enum/CONSISTENCY/DataFlowConsistency.expected
new file mode 100644
index 00000000000..de0bfff0ae0
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Enum/CONSISTENCY/DataFlowConsistency.expected
@@ -0,0 +1,2 @@
+uniqueCallEnclosingCallable
+| gen_enum.rs:5:5:5:11 | CallExpr | Call should have one enclosing callable but has 0. |
diff --git a/rust/ql/test/extractor-tests/generated/Enum/Enum.ql b/rust/ql/test/extractor-tests/generated/Enum/Enum.ql
index 4ef58323c87..3468056c072 100644
--- a/rust/ql/test/extractor-tests/generated/Enum/Enum.ql
+++ b/rust/ql/test/extractor-tests/generated/Enum/Enum.ql
@@ -3,17 +3,25 @@ import codeql.rust.elements
 import TestUtils
 
 from
-  Enum x, int getNumberOfAttrs, string hasGenericParamList, string hasName, string hasVariantList,
-  string hasVisibility, string hasWhereClause
+  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, "getNumberOfAttrs:", getNumberOfAttrs, "hasGenericParamList:", hasGenericParamList,
-  "hasName:", hasName, "hasVariantList:", hasVariantList, "hasVisibility:", hasVisibility,
-  "hasWhereClause:", hasWhereClause
+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_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/ExprStmt/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/extractor-tests/generated/ExprStmt/CONSISTENCY/DataFlowConsistency.expected
new file mode 100644
index 00000000000..a61eb890bd2
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ExprStmt/CONSISTENCY/DataFlowConsistency.expected
@@ -0,0 +1,3 @@
+uniqueCallEnclosingCallable
+| gen_expr_stmt.rs:5:5:5:11 | CallExpr | Call should have one enclosing callable but has 0. |
+| gen_expr_stmt.rs:6:5:6:12 | CallExpr | Call should have one enclosing callable but has 0. |
diff --git a/rust/ql/test/extractor-tests/generated/ExternBlock/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/extractor-tests/generated/ExternBlock/CONSISTENCY/DataFlowConsistency.expected
new file mode 100644
index 00000000000..ad05e1ef4e5
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ExternBlock/CONSISTENCY/DataFlowConsistency.expected
@@ -0,0 +1,2 @@
+uniqueCallEnclosingCallable
+| gen_extern_block.rs:5:5:5:11 | CallExpr | Call should have one enclosing callable but has 0. |
diff --git a/rust/ql/test/extractor-tests/generated/ExternBlock/ExternBlock.ql b/rust/ql/test/extractor-tests/generated/ExternBlock/ExternBlock.ql
index 7348a546ec2..3d58a471412 100644
--- a/rust/ql/test/extractor-tests/generated/ExternBlock/ExternBlock.ql
+++ b/rust/ql/test/extractor-tests/generated/ExternBlock/ExternBlock.ql
@@ -2,13 +2,22 @@
 import codeql.rust.elements
 import TestUtils
 
-from ExternBlock x, string hasAbi, int getNumberOfAttrs, string hasExternItemList, string isUnsafe
+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, "hasAbi:", hasAbi, "getNumberOfAttrs:", getNumberOfAttrs, "hasExternItemList:",
-  hasExternItemList, "isUnsafe:", isUnsafe
+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_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/ExternCrate/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/extractor-tests/generated/ExternCrate/CONSISTENCY/DataFlowConsistency.expected
new file mode 100644
index 00000000000..19bd5ac0769
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ExternCrate/CONSISTENCY/DataFlowConsistency.expected
@@ -0,0 +1,2 @@
+uniqueCallEnclosingCallable
+| gen_extern_crate.rs:5:5:5:11 | CallExpr | Call should have one enclosing callable but has 0. |
diff --git a/rust/ql/test/extractor-tests/generated/ExternCrate/ExternCrate.ql b/rust/ql/test/extractor-tests/generated/ExternCrate/ExternCrate.ql
index 56ebb02461a..547a2080864 100644
--- a/rust/ql/test/extractor-tests/generated/ExternCrate/ExternCrate.ql
+++ b/rust/ql/test/extractor-tests/generated/ExternCrate/ExternCrate.ql
@@ -2,13 +2,22 @@
 import codeql.rust.elements
 import TestUtils
 
-from ExternCrate x, int getNumberOfAttrs, string hasNameRef, string hasRename, string hasVisibility
+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, "getNumberOfAttrs:", getNumberOfAttrs, "hasNameRef:", hasNameRef, "hasRename:", hasRename,
+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_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/ExternItemList/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/extractor-tests/generated/ExternItemList/CONSISTENCY/DataFlowConsistency.expected
new file mode 100644
index 00000000000..091bd770cf2
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ExternItemList/CONSISTENCY/DataFlowConsistency.expected
@@ -0,0 +1,2 @@
+uniqueCallEnclosingCallable
+| gen_extern_item_list.rs:5:5:5:11 | CallExpr | Call should have one enclosing callable but has 0. |
diff --git a/rust/ql/test/extractor-tests/generated/FnPtrType/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/extractor-tests/generated/FnPtrType/CONSISTENCY/DataFlowConsistency.expected
new file mode 100644
index 00000000000..390e252ac7b
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/FnPtrType/CONSISTENCY/DataFlowConsistency.expected
@@ -0,0 +1,2 @@
+uniqueCallEnclosingCallable
+| gen_fn_ptr_type.rs:5:5:5:11 | CallExpr | Call should have one enclosing callable but has 0. |
diff --git a/rust/ql/test/extractor-tests/generated/ForExpr/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/extractor-tests/generated/ForExpr/CONSISTENCY/DataFlowConsistency.expected
new file mode 100644
index 00000000000..1d3d1611ab8
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ForExpr/CONSISTENCY/DataFlowConsistency.expected
@@ -0,0 +1,2 @@
+uniqueCallEnclosingCallable
+| gen_for_expr.rs:5:5:5:11 | CallExpr | Call should have one enclosing callable but has 0. |
diff --git a/rust/ql/test/extractor-tests/generated/ForType/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/extractor-tests/generated/ForType/CONSISTENCY/DataFlowConsistency.expected
new file mode 100644
index 00000000000..f16b7b31d41
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ForType/CONSISTENCY/DataFlowConsistency.expected
@@ -0,0 +1,2 @@
+uniqueCallEnclosingCallable
+| gen_for_type.rs:5:5:5:11 | CallExpr | Call should have one enclosing callable but has 0. |
diff --git a/rust/ql/test/extractor-tests/generated/FormatArgsArg/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/extractor-tests/generated/FormatArgsArg/CONSISTENCY/DataFlowConsistency.expected
new file mode 100644
index 00000000000..aa6acbf45e6
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/FormatArgsArg/CONSISTENCY/DataFlowConsistency.expected
@@ -0,0 +1,2 @@
+uniqueCallEnclosingCallable
+| gen_format_args_arg.rs:5:5:5:11 | CallExpr | Call should have one enclosing callable but has 0. |
diff --git a/rust/ql/test/extractor-tests/generated/FormatArgsExpr/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/extractor-tests/generated/FormatArgsExpr/CONSISTENCY/DataFlowConsistency.expected
new file mode 100644
index 00000000000..f9d07d24dd5
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/FormatArgsExpr/CONSISTENCY/DataFlowConsistency.expected
@@ -0,0 +1,2 @@
+uniqueCallEnclosingCallable
+| gen_format_args_expr.rs:5:5:5:11 | CallExpr | Call should have one enclosing callable but has 0. |
diff --git a/rust/ql/test/extractor-tests/generated/Function/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/extractor-tests/generated/Function/CONSISTENCY/DataFlowConsistency.expected
new file mode 100644
index 00000000000..c8ff66cfc26
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Function/CONSISTENCY/DataFlowConsistency.expected
@@ -0,0 +1,4 @@
+uniqueEnclosingCallable
+| gen_function.rs:4:8:4:13 | Param | Node should have one enclosing callable but has 0. |
+uniqueType
+| gen_function.rs:4:8:4:13 | Param | Node should have one type but has 0. |
diff --git a/rust/ql/test/extractor-tests/generated/Function/Function.expected b/rust/ql/test/extractor-tests/generated/Function/Function.expected
index cf2de6ac0a6..f93eb58b2ae 100644
--- a/rust/ql/test/extractor-tests/generated/Function/Function.expected
+++ b/rust/ql/test/extractor-tests/generated/Function/Function.expected
@@ -1,2 +1,2 @@
-| gen_function.rs:3:1:4:38 | foo | hasAbi: | no | getNumberOfAttrs: | 0 | hasBody: | yes | hasGenericParamList: | no | isAsync: | no | isConst: | no | isDefault: | no | isGen: | no | isUnsafe: | no | hasName: | yes | hasParamList: | yes | hasRetType: | yes | hasVisibility: | no | hasWhereClause: | no |
-| gen_function.rs:7:5:7:13 | bar | hasAbi: | no | getNumberOfAttrs: | 0 | hasBody: | no | hasGenericParamList: | no | isAsync: | no | isConst: | no | isDefault: | no | isGen: | no | isUnsafe: | no | hasName: | yes | hasParamList: | yes | hasRetType: | no | hasVisibility: | no | hasWhereClause: | no |
+| 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 9f4fed07e57..a6e969111fb 100644
--- a/rust/ql/test/extractor-tests/generated/Function/Function.ql
+++ b/rust/ql/test/extractor-tests/generated/Function/Function.ql
@@ -3,14 +3,22 @@ import codeql.rust.elements
 import TestUtils
 
 from
-  Function x, string hasAbi, int getNumberOfAttrs, string hasBody, string hasGenericParamList,
-  string isAsync, string isConst, string isDefault, string isGen, string isUnsafe, string hasName,
-  string hasParamList, string hasRetType, string hasVisibility, string hasWhereClause
+  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
-  (if x.hasAbi() then hasAbi = "yes" else hasAbi = "no") and
+  (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
@@ -19,12 +27,12 @@ where
   (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.hasParamList() then hasParamList = "yes" else hasParamList = "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, "hasAbi:", hasAbi, "getNumberOfAttrs:", getNumberOfAttrs, "hasBody:", hasBody,
-  "hasGenericParamList:", hasGenericParamList, "isAsync:", isAsync, "isConst:", isConst,
-  "isDefault:", isDefault, "isGen:", isGen, "isUnsafe:", isUnsafe, "hasName:", hasName,
-  "hasParamList:", hasParamList, "hasRetType:", hasRetType, "hasVisibility:", hasVisibility,
+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_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/GenericParamList/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/extractor-tests/generated/GenericParamList/CONSISTENCY/DataFlowConsistency.expected
new file mode 100644
index 00000000000..81b8dfb753c
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/GenericParamList/CONSISTENCY/DataFlowConsistency.expected
@@ -0,0 +1,2 @@
+uniqueCallEnclosingCallable
+| gen_generic_param_list.rs:5:5:5:11 | CallExpr | Call should have one enclosing callable but has 0. |
diff --git a/rust/ql/test/extractor-tests/generated/IfExpr/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/extractor-tests/generated/IfExpr/CONSISTENCY/DataFlowConsistency.expected
new file mode 100644
index 00000000000..22972bbf2a3
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/IfExpr/CONSISTENCY/DataFlowConsistency.expected
@@ -0,0 +1,2 @@
+uniqueCallEnclosingCallable
+| gen_if_expr.rs:6:18:6:36 | CallExpr | Call should have one enclosing callable but has 0. |
diff --git a/rust/ql/test/extractor-tests/generated/Impl/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/extractor-tests/generated/Impl/CONSISTENCY/DataFlowConsistency.expected
new file mode 100644
index 00000000000..227d27e07aa
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Impl/CONSISTENCY/DataFlowConsistency.expected
@@ -0,0 +1,2 @@
+uniqueCallEnclosingCallable
+| gen_impl.rs:5:5:5:11 | CallExpr | Call should have one enclosing callable but has 0. |
diff --git a/rust/ql/test/extractor-tests/generated/Impl/Impl.ql b/rust/ql/test/extractor-tests/generated/Impl/Impl.ql
index b011141e5f7..5af0d0da0d4 100644
--- a/rust/ql/test/extractor-tests/generated/Impl/Impl.ql
+++ b/rust/ql/test/extractor-tests/generated/Impl/Impl.ql
@@ -3,12 +3,18 @@ import codeql.rust.elements
 import TestUtils
 
 from
-  Impl x, string hasAssocItemList, int getNumberOfAttrs, string hasGenericParamList, string isConst,
-  string isDefault, string isUnsafe, string hasSelfTy, string hasTrait, string hasVisibility,
-  string hasWhereClause
+  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
@@ -19,7 +25,8 @@ where
   (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, "hasAssocItemList:", hasAssocItemList, "getNumberOfAttrs:", getNumberOfAttrs,
+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_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/ImplTraitType/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/extractor-tests/generated/ImplTraitType/CONSISTENCY/DataFlowConsistency.expected
new file mode 100644
index 00000000000..58e934db3e5
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ImplTraitType/CONSISTENCY/DataFlowConsistency.expected
@@ -0,0 +1,2 @@
+uniqueCallEnclosingCallable
+| gen_impl_trait_type.rs:5:5:5:11 | CallExpr | Call should have one enclosing callable but has 0. |
diff --git a/rust/ql/test/extractor-tests/generated/InferType/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/extractor-tests/generated/InferType/CONSISTENCY/DataFlowConsistency.expected
new file mode 100644
index 00000000000..bb28a783fa6
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/InferType/CONSISTENCY/DataFlowConsistency.expected
@@ -0,0 +1,2 @@
+uniqueCallEnclosingCallable
+| gen_infer_type.rs:5:5:5:11 | CallExpr | Call should have one enclosing callable but has 0. |
diff --git a/rust/ql/test/extractor-tests/generated/ItemList/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/extractor-tests/generated/ItemList/CONSISTENCY/DataFlowConsistency.expected
new file mode 100644
index 00000000000..ba4bc758094
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ItemList/CONSISTENCY/DataFlowConsistency.expected
@@ -0,0 +1,2 @@
+uniqueCallEnclosingCallable
+| gen_item_list.rs:5:5:5:11 | CallExpr | Call should have one enclosing callable but has 0. |
diff --git a/rust/ql/test/extractor-tests/generated/Label/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/extractor-tests/generated/Label/CONSISTENCY/DataFlowConsistency.expected
new file mode 100644
index 00000000000..98a7ff00837
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Label/CONSISTENCY/DataFlowConsistency.expected
@@ -0,0 +1,2 @@
+uniqueCallEnclosingCallable
+| gen_label.rs:6:18:6:39 | CallExpr | Call should have one enclosing callable but has 0. |
diff --git a/rust/ql/test/extractor-tests/generated/LetElse/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/extractor-tests/generated/LetElse/CONSISTENCY/DataFlowConsistency.expected
new file mode 100644
index 00000000000..d85ad083cd2
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/LetElse/CONSISTENCY/DataFlowConsistency.expected
@@ -0,0 +1,2 @@
+uniqueCallEnclosingCallable
+| gen_let_else.rs:5:5:5:11 | CallExpr | Call should have one enclosing callable but has 0. |
diff --git a/rust/ql/test/extractor-tests/generated/LetExpr/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/extractor-tests/generated/LetExpr/CONSISTENCY/DataFlowConsistency.expected
new file mode 100644
index 00000000000..b34704056ca
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/LetExpr/CONSISTENCY/DataFlowConsistency.expected
@@ -0,0 +1,6 @@
+uniqueEnclosingCallable
+| gen_let_expr.rs:3:18:3:43 | Param | Node should have one enclosing callable but has 0. |
+uniqueCallEnclosingCallable
+| gen_let_expr.rs:6:18:6:24 | CallExpr | Call should have one enclosing callable but has 0. |
+uniqueType
+| gen_let_expr.rs:3:18:3:43 | Param | Node should have one type but has 0. |
diff --git a/rust/ql/test/extractor-tests/generated/LetStmt/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/extractor-tests/generated/LetStmt/CONSISTENCY/DataFlowConsistency.expected
new file mode 100644
index 00000000000..1dee4888d25
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/LetStmt/CONSISTENCY/DataFlowConsistency.expected
@@ -0,0 +1,2 @@
+uniqueCallEnclosingCallable
+| gen_let_stmt.rs:10:19:10:38 | CallExpr | Call should have one enclosing callable but has 0. |
diff --git a/rust/ql/test/extractor-tests/generated/Lifetime/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/extractor-tests/generated/Lifetime/CONSISTENCY/DataFlowConsistency.expected
new file mode 100644
index 00000000000..9ba1d1a73aa
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Lifetime/CONSISTENCY/DataFlowConsistency.expected
@@ -0,0 +1,2 @@
+uniqueCallEnclosingCallable
+| gen_lifetime.rs:5:5:5:11 | CallExpr | Call should have one enclosing callable but has 0. |
diff --git a/rust/ql/test/extractor-tests/generated/LifetimeArg/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/extractor-tests/generated/LifetimeArg/CONSISTENCY/DataFlowConsistency.expected
new file mode 100644
index 00000000000..09406b8a0ca
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/LifetimeArg/CONSISTENCY/DataFlowConsistency.expected
@@ -0,0 +1,2 @@
+uniqueCallEnclosingCallable
+| gen_lifetime_arg.rs:5:5:5:11 | CallExpr | Call should have one enclosing callable but has 0. |
diff --git a/rust/ql/test/extractor-tests/generated/LifetimeParam/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/extractor-tests/generated/LifetimeParam/CONSISTENCY/DataFlowConsistency.expected
new file mode 100644
index 00000000000..957a2421efd
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/LifetimeParam/CONSISTENCY/DataFlowConsistency.expected
@@ -0,0 +1,2 @@
+uniqueCallEnclosingCallable
+| gen_lifetime_param.rs:5:5:5:11 | CallExpr | Call should have one enclosing callable but has 0. |
diff --git a/rust/ql/test/extractor-tests/generated/LoopExpr/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/extractor-tests/generated/LoopExpr/CONSISTENCY/DataFlowConsistency.expected
new file mode 100644
index 00000000000..4ee3c3ba691
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/LoopExpr/CONSISTENCY/DataFlowConsistency.expected
@@ -0,0 +1,3 @@
+uniqueCallEnclosingCallable
+| gen_loop_expr.rs:6:18:6:40 | CallExpr | Call should have one enclosing callable but has 0. |
+| gen_loop_expr.rs:9:18:9:39 | CallExpr | Call should have one enclosing callable but has 0. |
diff --git a/rust/ql/test/extractor-tests/generated/MacroCall/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/extractor-tests/generated/MacroCall/CONSISTENCY/DataFlowConsistency.expected
new file mode 100644
index 00000000000..bdd983974ad
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MacroCall/CONSISTENCY/DataFlowConsistency.expected
@@ -0,0 +1,2 @@
+uniqueCallEnclosingCallable
+| gen_macro_call.rs:5:5:5:11 | CallExpr | Call should have one enclosing callable but has 0. |
diff --git a/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall.expected b/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall.expected
index 0aaee585a35..03bcc247a9d 100644
--- a/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall.expected
+++ b/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall.expected
@@ -1 +1 @@
-| gen_macro_call.rs:5:5:5:11 | MacroCall | getNumberOfAttrs: | 0 | hasPath: | yes | hasTokenTree: | yes | hasExpanded: | yes |
+| 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
index ed7bd1246b5..56044c127c2 100644
--- a/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall.ql
+++ b/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall.ql
@@ -2,13 +2,22 @@
 import codeql.rust.elements
 import TestUtils
 
-from MacroCall x, int getNumberOfAttrs, string hasPath, string hasTokenTree, string hasExpanded
+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, "getNumberOfAttrs:", getNumberOfAttrs, "hasPath:", hasPath, "hasTokenTree:", hasTokenTree,
+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_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_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/MacroDef/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/extractor-tests/generated/MacroDef/CONSISTENCY/DataFlowConsistency.expected
new file mode 100644
index 00000000000..ee243f52959
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MacroDef/CONSISTENCY/DataFlowConsistency.expected
@@ -0,0 +1,2 @@
+uniqueCallEnclosingCallable
+| gen_macro_def.rs:5:5:5:11 | CallExpr | Call should have one enclosing callable but has 0. |
diff --git a/rust/ql/test/extractor-tests/generated/MacroDef/MacroDef.ql b/rust/ql/test/extractor-tests/generated/MacroDef/MacroDef.ql
index ac6eb7e901c..957d5b9ea9e 100644
--- a/rust/ql/test/extractor-tests/generated/MacroDef/MacroDef.ql
+++ b/rust/ql/test/extractor-tests/generated/MacroDef/MacroDef.ql
@@ -3,15 +3,22 @@ import codeql.rust.elements
 import TestUtils
 
 from
-  MacroDef x, string hasArgs, int getNumberOfAttrs, string hasBody, string hasName,
-  string hasVisibility
+  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, "hasArgs:", hasArgs, "getNumberOfAttrs:", getNumberOfAttrs, "hasBody:", hasBody,
-  "hasName:", hasName, "hasVisibility:", hasVisibility
+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_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/MacroExpr/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/extractor-tests/generated/MacroExpr/CONSISTENCY/DataFlowConsistency.expected
new file mode 100644
index 00000000000..c7ad670935a
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MacroExpr/CONSISTENCY/DataFlowConsistency.expected
@@ -0,0 +1,2 @@
+uniqueCallEnclosingCallable
+| gen_macro_expr.rs:5:5:5:11 | CallExpr | Call should have one enclosing callable but has 0. |
diff --git a/rust/ql/test/extractor-tests/generated/MacroItems/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/extractor-tests/generated/MacroItems/CONSISTENCY/DataFlowConsistency.expected
new file mode 100644
index 00000000000..b8dc2491cb5
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MacroItems/CONSISTENCY/DataFlowConsistency.expected
@@ -0,0 +1,10 @@
+uniqueEnclosingCallable
+| common_definitions.rs:3:15:3:25 | Param | Node should have one enclosing callable but has 0. |
+| file://:0:0:0:0 | Param | Node should have one enclosing callable but has 0. |
+uniqueType
+| common_definitions.rs:3:15:3:25 | Param | Node should have one type but has 0. |
+| file://:0:0:0:0 | Param | Node should have one type but has 0. |
+uniqueNodeLocation
+| file://:0:0:0:0 | Param | Node should have one location but has 0. |
+missingLocation
+| Nodes without location: 1 |
diff --git a/rust/ql/test/extractor-tests/generated/MacroPat/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/extractor-tests/generated/MacroPat/CONSISTENCY/DataFlowConsistency.expected
new file mode 100644
index 00000000000..17ad8956721
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MacroPat/CONSISTENCY/DataFlowConsistency.expected
@@ -0,0 +1,2 @@
+uniqueCallEnclosingCallable
+| gen_macro_pat.rs:5:5:5:11 | CallExpr | Call should have one enclosing callable but has 0. |
diff --git a/rust/ql/test/extractor-tests/generated/MacroRules/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/extractor-tests/generated/MacroRules/CONSISTENCY/DataFlowConsistency.expected
new file mode 100644
index 00000000000..02d3818cdce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MacroRules/CONSISTENCY/DataFlowConsistency.expected
@@ -0,0 +1,2 @@
+uniqueCallEnclosingCallable
+| gen_macro_rules.rs:5:5:5:11 | CallExpr | Call should have one enclosing callable but has 0. |
diff --git a/rust/ql/test/extractor-tests/generated/MacroRules/MacroRules.ql b/rust/ql/test/extractor-tests/generated/MacroRules/MacroRules.ql
index c17c5085c23..7bdc462c01c 100644
--- a/rust/ql/test/extractor-tests/generated/MacroRules/MacroRules.ql
+++ b/rust/ql/test/extractor-tests/generated/MacroRules/MacroRules.ql
@@ -2,13 +2,22 @@
 import codeql.rust.elements
 import TestUtils
 
-from MacroRules x, int getNumberOfAttrs, string hasName, string hasTokenTree, string hasVisibility
+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, "getNumberOfAttrs:", getNumberOfAttrs, "hasName:", hasName, "hasTokenTree:", hasTokenTree,
+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_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/MacroStmts/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/extractor-tests/generated/MacroStmts/CONSISTENCY/DataFlowConsistency.expected
new file mode 100644
index 00000000000..06cdb250151
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MacroStmts/CONSISTENCY/DataFlowConsistency.expected
@@ -0,0 +1,2 @@
+uniqueCallEnclosingCallable
+| gen_macro_stmts.rs:5:14:5:28 | CallExpr | Call should have one enclosing callable but has 0. |
diff --git a/rust/ql/test/extractor-tests/generated/MacroType/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/extractor-tests/generated/MacroType/CONSISTENCY/DataFlowConsistency.expected
new file mode 100644
index 00000000000..648d9c7b5e9
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MacroType/CONSISTENCY/DataFlowConsistency.expected
@@ -0,0 +1,2 @@
+uniqueCallEnclosingCallable
+| gen_macro_type.rs:5:5:5:11 | CallExpr | Call should have one enclosing callable but has 0. |
diff --git a/rust/ql/test/extractor-tests/generated/MatchArm/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/extractor-tests/generated/MatchArm/CONSISTENCY/DataFlowConsistency.expected
new file mode 100644
index 00000000000..c3785fcc7a4
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MatchArm/CONSISTENCY/DataFlowConsistency.expected
@@ -0,0 +1,4 @@
+uniqueEnclosingCallable
+| gen_match_arm.rs:3:19:3:24 | Param | Node should have one enclosing callable but has 0. |
+uniqueType
+| gen_match_arm.rs:3:19:3:24 | Param | Node should have one type but has 0. |
diff --git a/rust/ql/test/extractor-tests/generated/MatchArmList/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/extractor-tests/generated/MatchArmList/CONSISTENCY/DataFlowConsistency.expected
new file mode 100644
index 00000000000..26b43ec4f7d
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MatchArmList/CONSISTENCY/DataFlowConsistency.expected
@@ -0,0 +1,2 @@
+uniqueCallEnclosingCallable
+| gen_match_arm_list.rs:5:5:5:11 | CallExpr | Call should have one enclosing callable but has 0. |
diff --git a/rust/ql/test/extractor-tests/generated/MatchExpr/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/extractor-tests/generated/MatchExpr/CONSISTENCY/DataFlowConsistency.expected
new file mode 100644
index 00000000000..5bcb0701844
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MatchExpr/CONSISTENCY/DataFlowConsistency.expected
@@ -0,0 +1,4 @@
+uniqueEnclosingCallable
+| gen_match_expr.rs:3:20:3:25 | Param | Node should have one enclosing callable but has 0. |
+uniqueType
+| gen_match_expr.rs:3:20:3:25 | Param | Node should have one type but has 0. |
diff --git a/rust/ql/test/extractor-tests/generated/MatchGuard/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/extractor-tests/generated/MatchGuard/CONSISTENCY/DataFlowConsistency.expected
new file mode 100644
index 00000000000..439b5fb9bc4
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MatchGuard/CONSISTENCY/DataFlowConsistency.expected
@@ -0,0 +1,2 @@
+uniqueCallEnclosingCallable
+| gen_match_guard.rs:5:5:5:11 | CallExpr | Call should have one enclosing callable but has 0. |
diff --git a/rust/ql/test/extractor-tests/generated/Meta/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/extractor-tests/generated/Meta/CONSISTENCY/DataFlowConsistency.expected
new file mode 100644
index 00000000000..42fa4d47b6b
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Meta/CONSISTENCY/DataFlowConsistency.expected
@@ -0,0 +1,2 @@
+uniqueCallEnclosingCallable
+| gen_meta.rs:5:5:5:11 | CallExpr | Call should have one enclosing callable but has 0. |
diff --git a/rust/ql/test/extractor-tests/generated/Module/Module.expected b/rust/ql/test/extractor-tests/generated/Module/Module.expected
index 2020ab72dc1..d7c04f7c118 100644
--- a/rust/ql/test/extractor-tests/generated/Module/Module.expected
+++ b/rust/ql/test/extractor-tests/generated/Module/Module.expected
@@ -1,3 +1,3 @@
-| gen_module.rs:3:1:4:8 | Module | getNumberOfAttrs: | 0 | hasItemList: | no | hasName: | yes | hasVisibility: | no |
-| gen_module.rs:5:1:7:1 | Module | getNumberOfAttrs: | 0 | hasItemList: | yes | hasName: | yes | hasVisibility: | no |
-| lib.rs:2:1:2:15 | Module | getNumberOfAttrs: | 0 | hasItemList: | no | hasName: | yes | hasVisibility: | no |
+| 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 d9b358516d1..a33b7daa895 100644
--- a/rust/ql/test/extractor-tests/generated/Module/Module.ql
+++ b/rust/ql/test/extractor-tests/generated/Module/Module.ql
@@ -2,13 +2,22 @@
 import codeql.rust.elements
 import TestUtils
 
-from Module x, int getNumberOfAttrs, string hasItemList, string hasName, string hasVisibility
+from
+  Module x, string hasExtendedCanonicalPath, string hasCrateOrigin, int getNumberOfAttrs,
+  string hasItemList, string hasName, string hasVisibility
 where
   toBeTested(x) and
   not x.isUnknown() and
+  (
+    if x.hasExtendedCanonicalPath()
+    then hasExtendedCanonicalPath = "yes"
+    else hasExtendedCanonicalPath = "no"
+  ) and
+  (if x.hasCrateOrigin() then hasCrateOrigin = "yes" else hasCrateOrigin = "no") and
   getNumberOfAttrs = x.getNumberOfAttrs() and
   (if x.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, "getNumberOfAttrs:", getNumberOfAttrs, "hasItemList:", hasItemList, "hasName:", hasName,
+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_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_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_getName.expected b/rust/ql/test/extractor-tests/generated/Module/Module_getName.expected
index 3a8692beec6..918f151e292 100644
--- a/rust/ql/test/extractor-tests/generated/Module/Module_getName.expected
+++ b/rust/ql/test/extractor-tests/generated/Module/Module_getName.expected
@@ -1,3 +1,3 @@
 | gen_module.rs:3:1:4:8 | Module | gen_module.rs:4:5:4:7 | Name |
 | gen_module.rs:5:1:7:1 | Module | gen_module.rs:5:5:5:7 | Name |
-| lib.rs:2:1:2:15 | Module | lib.rs:2:5:2:14 | Name |
+| lib.rs:1:1:1:15 | Module | lib.rs:1:5:1:14 | Name |
diff --git a/rust/ql/test/extractor-tests/generated/Name/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/extractor-tests/generated/Name/CONSISTENCY/DataFlowConsistency.expected
new file mode 100644
index 00000000000..2b99cf5f0ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Name/CONSISTENCY/DataFlowConsistency.expected
@@ -0,0 +1,2 @@
+uniqueCallEnclosingCallable
+| gen_name.rs:5:5:5:11 | CallExpr | Call should have one enclosing callable but has 0. |
diff --git a/rust/ql/test/extractor-tests/generated/Name/Name.expected b/rust/ql/test/extractor-tests/generated/Name/Name.expected
index 556c1dff2dd..38072342a84 100644
--- a/rust/ql/test/extractor-tests/generated/Name/Name.expected
+++ b/rust/ql/test/extractor-tests/generated/Name/Name.expected
@@ -1,2 +1,2 @@
 | gen_name.rs:3:4:3:12 | Name | hasText: | yes |
-| lib.rs:2:5:2:12 | Name | hasText: | yes |
+| lib.rs:1:5:1:12 | Name | hasText: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/Name/Name_getText.expected b/rust/ql/test/extractor-tests/generated/Name/Name_getText.expected
index 89623f2108e..edc4ae3244d 100644
--- a/rust/ql/test/extractor-tests/generated/Name/Name_getText.expected
+++ b/rust/ql/test/extractor-tests/generated/Name/Name_getText.expected
@@ -1,2 +1,2 @@
 | gen_name.rs:3:4:3:12 | Name | test_name |
-| lib.rs:2:5:2:12 | Name | gen_name |
+| lib.rs:1:5:1:12 | Name | gen_name |
diff --git a/rust/ql/test/extractor-tests/generated/NameRef/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/extractor-tests/generated/NameRef/CONSISTENCY/DataFlowConsistency.expected
new file mode 100644
index 00000000000..096f35c3be6
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/NameRef/CONSISTENCY/DataFlowConsistency.expected
@@ -0,0 +1,2 @@
+uniqueCallEnclosingCallable
+| gen_name_ref.rs:5:5:5:11 | CallExpr | Call should have one enclosing callable but has 0. |
diff --git a/rust/ql/test/extractor-tests/generated/NeverType/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/extractor-tests/generated/NeverType/CONSISTENCY/DataFlowConsistency.expected
new file mode 100644
index 00000000000..bbc5916ad4b
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/NeverType/CONSISTENCY/DataFlowConsistency.expected
@@ -0,0 +1,2 @@
+uniqueCallEnclosingCallable
+| gen_never_type.rs:5:5:5:11 | CallExpr | Call should have one enclosing callable but has 0. |
diff --git a/rust/ql/test/extractor-tests/generated/Param/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/extractor-tests/generated/Param/CONSISTENCY/DataFlowConsistency.expected
new file mode 100644
index 00000000000..407eed9d21d
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Param/CONSISTENCY/DataFlowConsistency.expected
@@ -0,0 +1,2 @@
+uniqueCallEnclosingCallable
+| gen_param.rs:5:5:5:11 | CallExpr | Call should have one enclosing callable but has 0. |
diff --git a/rust/ql/test/extractor-tests/generated/ParamList/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/extractor-tests/generated/ParamList/CONSISTENCY/DataFlowConsistency.expected
new file mode 100644
index 00000000000..0cc0694a7c3
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ParamList/CONSISTENCY/DataFlowConsistency.expected
@@ -0,0 +1,2 @@
+uniqueCallEnclosingCallable
+| gen_param_list.rs:5:5:5:11 | CallExpr | Call should have one enclosing callable but has 0. |
diff --git a/rust/ql/test/extractor-tests/generated/ParenExpr/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/extractor-tests/generated/ParenExpr/CONSISTENCY/DataFlowConsistency.expected
new file mode 100644
index 00000000000..ea7c55275ff
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ParenExpr/CONSISTENCY/DataFlowConsistency.expected
@@ -0,0 +1,2 @@
+uniqueCallEnclosingCallable
+| gen_paren_expr.rs:5:5:5:11 | CallExpr | Call should have one enclosing callable but has 0. |
diff --git a/rust/ql/test/extractor-tests/generated/ParenPat/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/extractor-tests/generated/ParenPat/CONSISTENCY/DataFlowConsistency.expected
new file mode 100644
index 00000000000..289b92becb3
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ParenPat/CONSISTENCY/DataFlowConsistency.expected
@@ -0,0 +1,2 @@
+uniqueCallEnclosingCallable
+| gen_paren_pat.rs:5:5:5:11 | CallExpr | Call should have one enclosing callable but has 0. |
diff --git a/rust/ql/test/extractor-tests/generated/ParenType/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/extractor-tests/generated/ParenType/CONSISTENCY/DataFlowConsistency.expected
new file mode 100644
index 00000000000..8906108a4b8
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ParenType/CONSISTENCY/DataFlowConsistency.expected
@@ -0,0 +1,2 @@
+uniqueCallEnclosingCallable
+| gen_paren_type.rs:5:5:5:11 | CallExpr | Call should have one enclosing callable but has 0. |
diff --git a/rust/ql/test/extractor-tests/generated/PathSegment/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/extractor-tests/generated/PathSegment/CONSISTENCY/DataFlowConsistency.expected
new file mode 100644
index 00000000000..ffc2113f2c3
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/PathSegment/CONSISTENCY/DataFlowConsistency.expected
@@ -0,0 +1,2 @@
+uniqueCallEnclosingCallable
+| gen_path_segment.rs:5:5:5:11 | CallExpr | Call should have one enclosing callable but has 0. |
diff --git a/rust/ql/test/extractor-tests/generated/PathType/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/extractor-tests/generated/PathType/CONSISTENCY/DataFlowConsistency.expected
new file mode 100644
index 00000000000..4177421433d
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/PathType/CONSISTENCY/DataFlowConsistency.expected
@@ -0,0 +1,2 @@
+uniqueCallEnclosingCallable
+| gen_path_type.rs:5:5:5:11 | CallExpr | Call should have one enclosing callable but has 0. |
diff --git a/rust/ql/test/extractor-tests/generated/PtrType/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/extractor-tests/generated/PtrType/CONSISTENCY/DataFlowConsistency.expected
new file mode 100644
index 00000000000..479844cd49d
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/PtrType/CONSISTENCY/DataFlowConsistency.expected
@@ -0,0 +1,2 @@
+uniqueCallEnclosingCallable
+| gen_ptr_type.rs:5:5:5:11 | CallExpr | Call should have one enclosing callable but has 0. |
diff --git a/rust/ql/test/extractor-tests/generated/RecordExprFieldList/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/extractor-tests/generated/RecordExprFieldList/CONSISTENCY/DataFlowConsistency.expected
new file mode 100644
index 00000000000..4257c505c3d
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/RecordExprFieldList/CONSISTENCY/DataFlowConsistency.expected
@@ -0,0 +1,2 @@
+uniqueCallEnclosingCallable
+| gen_record_expr_field_list.rs:5:5:5:11 | CallExpr | Call should have one enclosing callable but has 0. |
diff --git a/rust/ql/test/extractor-tests/generated/RecordField/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/extractor-tests/generated/RecordField/CONSISTENCY/DataFlowConsistency.expected
new file mode 100644
index 00000000000..f270d7b40e5
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/RecordField/CONSISTENCY/DataFlowConsistency.expected
@@ -0,0 +1,2 @@
+uniqueCallEnclosingCallable
+| gen_record_field.rs:5:5:5:11 | CallExpr | Call should have one enclosing callable but has 0. |
diff --git a/rust/ql/test/extractor-tests/generated/RecordFieldList/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/extractor-tests/generated/RecordFieldList/CONSISTENCY/DataFlowConsistency.expected
new file mode 100644
index 00000000000..4af964c2d1c
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/RecordFieldList/CONSISTENCY/DataFlowConsistency.expected
@@ -0,0 +1,2 @@
+uniqueCallEnclosingCallable
+| gen_record_field_list.rs:5:5:5:11 | CallExpr | Call should have one enclosing callable but has 0. |
diff --git a/rust/ql/test/extractor-tests/generated/RecordPatFieldList/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/extractor-tests/generated/RecordPatFieldList/CONSISTENCY/DataFlowConsistency.expected
new file mode 100644
index 00000000000..bd7f24d8db9
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/RecordPatFieldList/CONSISTENCY/DataFlowConsistency.expected
@@ -0,0 +1,2 @@
+uniqueCallEnclosingCallable
+| gen_record_pat_field_list.rs:5:5:5:11 | CallExpr | Call should have one enclosing callable but has 0. |
diff --git a/rust/ql/test/extractor-tests/generated/RefType/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/extractor-tests/generated/RefType/CONSISTENCY/DataFlowConsistency.expected
new file mode 100644
index 00000000000..88e03f6a0dd
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/RefType/CONSISTENCY/DataFlowConsistency.expected
@@ -0,0 +1,2 @@
+uniqueCallEnclosingCallable
+| gen_ref_type.rs:5:5:5:11 | CallExpr | Call should have one enclosing callable but has 0. |
diff --git a/rust/ql/test/extractor-tests/generated/Rename/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/extractor-tests/generated/Rename/CONSISTENCY/DataFlowConsistency.expected
new file mode 100644
index 00000000000..0f90df1fb52
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Rename/CONSISTENCY/DataFlowConsistency.expected
@@ -0,0 +1,2 @@
+uniqueCallEnclosingCallable
+| gen_rename.rs:5:5:5:11 | CallExpr | Call should have one enclosing callable but has 0. |
diff --git a/rust/ql/test/extractor-tests/generated/RestPat/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/extractor-tests/generated/RestPat/CONSISTENCY/DataFlowConsistency.expected
new file mode 100644
index 00000000000..e022948872f
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/RestPat/CONSISTENCY/DataFlowConsistency.expected
@@ -0,0 +1,2 @@
+uniqueCallEnclosingCallable
+| gen_rest_pat.rs:5:5:5:11 | CallExpr | Call should have one enclosing callable but has 0. |
diff --git a/rust/ql/test/extractor-tests/generated/RetType/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/extractor-tests/generated/RetType/CONSISTENCY/DataFlowConsistency.expected
new file mode 100644
index 00000000000..4257c03e77e
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/RetType/CONSISTENCY/DataFlowConsistency.expected
@@ -0,0 +1,2 @@
+uniqueCallEnclosingCallable
+| gen_ret_type.rs:5:5:5:11 | CallExpr | Call should have one enclosing callable but has 0. |
diff --git a/rust/ql/test/extractor-tests/generated/ReturnTypeSyntax/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/extractor-tests/generated/ReturnTypeSyntax/CONSISTENCY/DataFlowConsistency.expected
new file mode 100644
index 00000000000..36698d05127
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ReturnTypeSyntax/CONSISTENCY/DataFlowConsistency.expected
@@ -0,0 +1,2 @@
+uniqueCallEnclosingCallable
+| gen_return_type_syntax.rs:5:5:5:11 | CallExpr | Call should have one enclosing callable but has 0. |
diff --git a/rust/ql/test/extractor-tests/generated/SelfParam/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/extractor-tests/generated/SelfParam/CONSISTENCY/DataFlowConsistency.expected
new file mode 100644
index 00000000000..04c83cac5ca
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/SelfParam/CONSISTENCY/DataFlowConsistency.expected
@@ -0,0 +1,2 @@
+uniqueCallEnclosingCallable
+| gen_self_param.rs:5:5:5:11 | CallExpr | Call should have one enclosing callable but has 0. |
diff --git a/rust/ql/test/extractor-tests/generated/SliceType/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/extractor-tests/generated/SliceType/CONSISTENCY/DataFlowConsistency.expected
new file mode 100644
index 00000000000..11057278dc1
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/SliceType/CONSISTENCY/DataFlowConsistency.expected
@@ -0,0 +1,2 @@
+uniqueCallEnclosingCallable
+| gen_slice_type.rs:5:5:5:11 | CallExpr | Call should have one enclosing callable but has 0. |
diff --git a/rust/ql/test/extractor-tests/generated/SourceFile/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/extractor-tests/generated/SourceFile/CONSISTENCY/DataFlowConsistency.expected
new file mode 100644
index 00000000000..7e38d04aa14
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/SourceFile/CONSISTENCY/DataFlowConsistency.expected
@@ -0,0 +1,2 @@
+uniqueCallEnclosingCallable
+| gen_source_file.rs:5:5:5:11 | CallExpr | Call should have one enclosing callable but has 0. |
diff --git a/rust/ql/test/extractor-tests/generated/SourceFile/SourceFile.expected b/rust/ql/test/extractor-tests/generated/SourceFile/SourceFile.expected
index 5c1ad52bfc3..9aac17e8e84 100644
--- a/rust/ql/test/extractor-tests/generated/SourceFile/SourceFile.expected
+++ b/rust/ql/test/extractor-tests/generated/SourceFile/SourceFile.expected
@@ -1,2 +1,2 @@
 | gen_source_file.rs:1:1:6:2 | SourceFile | getNumberOfAttrs: | 0 | getNumberOfItems: | 1 |
-| lib.rs:1:1:2:21 | 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_getItem.expected b/rust/ql/test/extractor-tests/generated/SourceFile/SourceFile_getItem.expected
index aba10e75baa..a256c2b84b2 100644
--- a/rust/ql/test/extractor-tests/generated/SourceFile/SourceFile_getItem.expected
+++ b/rust/ql/test/extractor-tests/generated/SourceFile/SourceFile_getItem.expected
@@ -1,2 +1,2 @@
 | gen_source_file.rs:1:1:6:2 | SourceFile | 0 | gen_source_file.rs:3:1:6:1 | test_source_file |
-| lib.rs:1:1:2:21 | SourceFile | 0 | lib.rs:2:1:2:20 | Module |
+| lib.rs:1:1:1:20 | SourceFile | 0 | lib.rs:1:1:1:20 | Module |
diff --git a/rust/ql/test/extractor-tests/generated/Static/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/extractor-tests/generated/Static/CONSISTENCY/DataFlowConsistency.expected
new file mode 100644
index 00000000000..8d77fc54d18
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Static/CONSISTENCY/DataFlowConsistency.expected
@@ -0,0 +1,2 @@
+uniqueCallEnclosingCallable
+| gen_static.rs:5:5:5:11 | CallExpr | Call should have one enclosing callable but has 0. |
diff --git a/rust/ql/test/extractor-tests/generated/Static/Static.ql b/rust/ql/test/extractor-tests/generated/Static/Static.ql
index a1cac0742ee..7450b7778a1 100644
--- a/rust/ql/test/extractor-tests/generated/Static/Static.ql
+++ b/rust/ql/test/extractor-tests/generated/Static/Static.ql
@@ -3,11 +3,17 @@ import codeql.rust.elements
 import TestUtils
 
 from
-  Static x, int getNumberOfAttrs, string hasBody, string isMut, string isStatic, string hasName,
-  string hasTy, string hasVisibility
+  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
@@ -15,5 +21,6 @@ where
   (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, "hasBody:", hasBody, "isMut:", isMut, "isStatic:",
+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_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/StmtList/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/extractor-tests/generated/StmtList/CONSISTENCY/DataFlowConsistency.expected
new file mode 100644
index 00000000000..ffde32eaca7
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/StmtList/CONSISTENCY/DataFlowConsistency.expected
@@ -0,0 +1,2 @@
+uniqueCallEnclosingCallable
+| gen_stmt_list.rs:5:5:5:11 | CallExpr | Call should have one enclosing callable but has 0. |
diff --git a/rust/ql/test/extractor-tests/generated/Struct/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/extractor-tests/generated/Struct/CONSISTENCY/DataFlowConsistency.expected
new file mode 100644
index 00000000000..bb1b7bb7455
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Struct/CONSISTENCY/DataFlowConsistency.expected
@@ -0,0 +1,2 @@
+uniqueCallEnclosingCallable
+| gen_struct.rs:5:5:5:11 | CallExpr | Call should have one enclosing callable but has 0. |
diff --git a/rust/ql/test/extractor-tests/generated/Struct/Struct.ql b/rust/ql/test/extractor-tests/generated/Struct/Struct.ql
index 8f9c02aee17..d2b3a349386 100644
--- a/rust/ql/test/extractor-tests/generated/Struct/Struct.ql
+++ b/rust/ql/test/extractor-tests/generated/Struct/Struct.ql
@@ -3,17 +3,25 @@ import codeql.rust.elements
 import TestUtils
 
 from
-  Struct x, int getNumberOfAttrs, string hasFieldList, string hasGenericParamList, string hasName,
-  string hasVisibility, string hasWhereClause
+  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, "getNumberOfAttrs:", getNumberOfAttrs, "hasFieldList:", hasFieldList,
-  "hasGenericParamList:", hasGenericParamList, "hasName:", hasName, "hasVisibility:", hasVisibility,
-  "hasWhereClause:", hasWhereClause
+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_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/TokenTree/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/extractor-tests/generated/TokenTree/CONSISTENCY/DataFlowConsistency.expected
new file mode 100644
index 00000000000..0e08b946844
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/TokenTree/CONSISTENCY/DataFlowConsistency.expected
@@ -0,0 +1,2 @@
+uniqueCallEnclosingCallable
+| gen_token_tree.rs:5:5:5:11 | CallExpr | Call should have one enclosing callable but has 0. |
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/AssocItemList/AssocItemList.ql b/rust/ql/test/extractor-tests/generated/Trait/AssocItemList.ql
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/AssocItemList/AssocItemList.ql
rename to rust/ql/test/extractor-tests/generated/Trait/AssocItemList.ql
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/AssocItemList/AssocItemList_getAssocItem.ql b/rust/ql/test/extractor-tests/generated/Trait/AssocItemList_getAssocItem.ql
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/AssocItemList/AssocItemList_getAssocItem.ql
rename to rust/ql/test/extractor-tests/generated/Trait/AssocItemList_getAssocItem.ql
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/AssocItemList/AssocItemList_getAttr.ql b/rust/ql/test/extractor-tests/generated/Trait/AssocItemList_getAttr.ql
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/AssocItemList/AssocItemList_getAttr.ql
rename to rust/ql/test/extractor-tests/generated/Trait/AssocItemList_getAttr.ql
diff --git a/rust/ql/test/extractor-tests/generated/Trait/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/extractor-tests/generated/Trait/CONSISTENCY/DataFlowConsistency.expected
new file mode 100644
index 00000000000..167b3481ee5
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Trait/CONSISTENCY/DataFlowConsistency.expected
@@ -0,0 +1,4 @@
+uniqueEnclosingCallable
+| gen_trait.rs:7:32:7:60 | Param | Node should have one enclosing callable but has 0. |
+uniqueType
+| gen_trait.rs:7:32:7:60 | Param | Node should have one type but has 0. |
diff --git a/rust/ql/test/extractor-tests/generated/Trait/Trait.expected b/rust/ql/test/extractor-tests/generated/Trait/Trait.expected
index e69de29bb2d..ba06219a2d4 100644
--- a/rust/ql/test/extractor-tests/generated/Trait/Trait.expected
+++ 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
index 3551f78de6b..b4548cddcee 100644
--- a/rust/ql/test/extractor-tests/generated/Trait/Trait.ql
+++ b/rust/ql/test/extractor-tests/generated/Trait/Trait.ql
@@ -3,12 +3,18 @@ import codeql.rust.elements
 import TestUtils
 
 from
-  Trait x, string hasAssocItemList, int getNumberOfAttrs, string hasGenericParamList, string isAuto,
-  string isUnsafe, string hasName, string hasTypeBoundList, string hasVisibility,
-  string hasWhereClause
+  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
@@ -18,7 +24,8 @@ where
   (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, "hasAssocItemList:", hasAssocItemList, "getNumberOfAttrs:", getNumberOfAttrs,
+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
index e69de29bb2d..fc16a774800 100644
--- a/rust/ql/test/extractor-tests/generated/Trait/Trait_getAssocItemList.expected
+++ 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_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
index e69de29bb2d..85a848355f1 100644
--- a/rust/ql/test/extractor-tests/generated/Trait/Trait_getGenericParamList.expected
+++ 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_getName.expected b/rust/ql/test/extractor-tests/generated/Trait/Trait_getName.expected
index e69de29bb2d..c9fbc3495f1 100644
--- a/rust/ql/test/extractor-tests/generated/Trait/Trait_getName.expected
+++ 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 | Name |
+| gen_trait.rs:10:1:10:57 | Trait | gen_trait.rs:10:11:10:13 | Name |
diff --git a/rust/ql/test/extractor-tests/generated/Trait/Trait_getVisibility.expected b/rust/ql/test/extractor-tests/generated/Trait/Trait_getVisibility.expected
index e69de29bb2d..67d505acda7 100644
--- a/rust/ql/test/extractor-tests/generated/Trait/Trait_getVisibility.expected
+++ 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_getWhereClause.expected b/rust/ql/test/extractor-tests/generated/Trait/Trait_getWhereClause.expected
index e69de29bb2d..a1ae3161e79 100644
--- a/rust/ql/test/extractor-tests/generated/Trait/Trait_getWhereClause.expected
+++ 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/gen_trait.rs b/rust/ql/test/extractor-tests/generated/Trait/gen_trait.rs
index c35e33c24ec..a6f30619ffa 100644
--- a/rust/ql/test/extractor-tests/generated/Trait/gen_trait.rs
+++ b/rust/ql/test/extractor-tests/generated/Trait/gen_trait.rs
@@ -1,6 +1,10 @@
 // generated by codegen, do not edit
 
-fn test_trait() -> () {
-    // A Trait. For example:
-    todo!()
+// 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/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/extractor-tests/generated/TraitAlias/CONSISTENCY/DataFlowConsistency.expected
new file mode 100644
index 00000000000..7c9cad6e558
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/TraitAlias/CONSISTENCY/DataFlowConsistency.expected
@@ -0,0 +1,2 @@
+uniqueCallEnclosingCallable
+| gen_trait_alias.rs:5:5:5:11 | CallExpr | Call should have one enclosing callable but has 0. |
diff --git a/rust/ql/test/extractor-tests/generated/TraitAlias/TraitAlias.ql b/rust/ql/test/extractor-tests/generated/TraitAlias/TraitAlias.ql
index cd475f68ee4..80fe86e2749 100644
--- a/rust/ql/test/extractor-tests/generated/TraitAlias/TraitAlias.ql
+++ b/rust/ql/test/extractor-tests/generated/TraitAlias/TraitAlias.ql
@@ -3,17 +3,25 @@ import codeql.rust.elements
 import TestUtils
 
 from
-  TraitAlias x, int getNumberOfAttrs, string hasGenericParamList, string hasName,
-  string hasTypeBoundList, string hasVisibility, string hasWhereClause
+  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, "getNumberOfAttrs:", getNumberOfAttrs, "hasGenericParamList:", hasGenericParamList,
-  "hasName:", hasName, "hasTypeBoundList:", hasTypeBoundList, "hasVisibility:", hasVisibility,
+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_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/TryExpr/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/extractor-tests/generated/TryExpr/CONSISTENCY/DataFlowConsistency.expected
new file mode 100644
index 00000000000..5caa9b9cd62
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/TryExpr/CONSISTENCY/DataFlowConsistency.expected
@@ -0,0 +1,2 @@
+uniqueCallEnclosingCallable
+| gen_try_expr.rs:5:5:5:11 | CallExpr | Call should have one enclosing callable but has 0. |
diff --git a/rust/ql/test/extractor-tests/generated/TupleField/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/extractor-tests/generated/TupleField/CONSISTENCY/DataFlowConsistency.expected
new file mode 100644
index 00000000000..973ff3f4912
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/TupleField/CONSISTENCY/DataFlowConsistency.expected
@@ -0,0 +1,2 @@
+uniqueCallEnclosingCallable
+| gen_tuple_field.rs:5:5:5:11 | CallExpr | Call should have one enclosing callable but has 0. |
diff --git a/rust/ql/test/extractor-tests/generated/TupleFieldList/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/extractor-tests/generated/TupleFieldList/CONSISTENCY/DataFlowConsistency.expected
new file mode 100644
index 00000000000..da1c2914f3c
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/TupleFieldList/CONSISTENCY/DataFlowConsistency.expected
@@ -0,0 +1,2 @@
+uniqueCallEnclosingCallable
+| gen_tuple_field_list.rs:5:5:5:11 | CallExpr | Call should have one enclosing callable but has 0. |
diff --git a/rust/ql/test/extractor-tests/generated/TupleType/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/extractor-tests/generated/TupleType/CONSISTENCY/DataFlowConsistency.expected
new file mode 100644
index 00000000000..8a46b04b94a
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/TupleType/CONSISTENCY/DataFlowConsistency.expected
@@ -0,0 +1,2 @@
+uniqueCallEnclosingCallable
+| gen_tuple_type.rs:5:5:5:11 | CallExpr | Call should have one enclosing callable but has 0. |
diff --git a/rust/ql/test/extractor-tests/generated/TypeAlias/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/extractor-tests/generated/TypeAlias/CONSISTENCY/DataFlowConsistency.expected
new file mode 100644
index 00000000000..ca5cba3ef70
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/TypeAlias/CONSISTENCY/DataFlowConsistency.expected
@@ -0,0 +1,2 @@
+uniqueCallEnclosingCallable
+| gen_type_alias.rs:5:5:5:11 | CallExpr | Call should have one enclosing callable but has 0. |
diff --git a/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias.ql b/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias.ql
index 240791745dc..5959301f81a 100644
--- a/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias.ql
+++ b/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias.ql
@@ -3,11 +3,18 @@ import codeql.rust.elements
 import TestUtils
 
 from
-  TypeAlias x, int getNumberOfAttrs, string hasGenericParamList, string isDefault, string hasName,
-  string hasTy, string hasTypeBoundList, string hasVisibility, string hasWhereClause
+  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
@@ -16,6 +23,7 @@ where
   (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, "getNumberOfAttrs:", getNumberOfAttrs, "hasGenericParamList:", hasGenericParamList,
-  "isDefault:", isDefault, "hasName:", hasName, "hasTy:", hasTy, "hasTypeBoundList:",
-  hasTypeBoundList, "hasVisibility:", hasVisibility, "hasWhereClause:", hasWhereClause
+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_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/TypeArg/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/extractor-tests/generated/TypeArg/CONSISTENCY/DataFlowConsistency.expected
new file mode 100644
index 00000000000..ae0c6897dc8
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/TypeArg/CONSISTENCY/DataFlowConsistency.expected
@@ -0,0 +1,2 @@
+uniqueCallEnclosingCallable
+| gen_type_arg.rs:5:5:5:11 | CallExpr | Call should have one enclosing callable but has 0. |
diff --git a/rust/ql/test/extractor-tests/generated/TypeBound/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/extractor-tests/generated/TypeBound/CONSISTENCY/DataFlowConsistency.expected
new file mode 100644
index 00000000000..bef99bf5eeb
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/TypeBound/CONSISTENCY/DataFlowConsistency.expected
@@ -0,0 +1,2 @@
+uniqueCallEnclosingCallable
+| gen_type_bound.rs:5:5:5:11 | CallExpr | Call should have one enclosing callable but has 0. |
diff --git a/rust/ql/test/extractor-tests/generated/TypeBoundList/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/extractor-tests/generated/TypeBoundList/CONSISTENCY/DataFlowConsistency.expected
new file mode 100644
index 00000000000..e755f94b133
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/TypeBoundList/CONSISTENCY/DataFlowConsistency.expected
@@ -0,0 +1,2 @@
+uniqueCallEnclosingCallable
+| gen_type_bound_list.rs:5:5:5:11 | CallExpr | Call should have one enclosing callable but has 0. |
diff --git a/rust/ql/test/extractor-tests/generated/TypeParam/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/extractor-tests/generated/TypeParam/CONSISTENCY/DataFlowConsistency.expected
new file mode 100644
index 00000000000..01475a67a1b
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/TypeParam/CONSISTENCY/DataFlowConsistency.expected
@@ -0,0 +1,2 @@
+uniqueCallEnclosingCallable
+| gen_type_param.rs:5:5:5:11 | CallExpr | Call should have one enclosing callable but has 0. |
diff --git a/rust/ql/test/extractor-tests/generated/Union/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/extractor-tests/generated/Union/CONSISTENCY/DataFlowConsistency.expected
new file mode 100644
index 00000000000..da831a05a08
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Union/CONSISTENCY/DataFlowConsistency.expected
@@ -0,0 +1,2 @@
+uniqueCallEnclosingCallable
+| gen_union.rs:5:5:5:11 | CallExpr | Call should have one enclosing callable but has 0. |
diff --git a/rust/ql/test/extractor-tests/generated/Union/Union.ql b/rust/ql/test/extractor-tests/generated/Union/Union.ql
index 4f3d288b0c2..0f0e0872d9d 100644
--- a/rust/ql/test/extractor-tests/generated/Union/Union.ql
+++ b/rust/ql/test/extractor-tests/generated/Union/Union.ql
@@ -3,17 +3,25 @@ import codeql.rust.elements
 import TestUtils
 
 from
-  Union x, int getNumberOfAttrs, string hasGenericParamList, string hasName,
-  string hasRecordFieldList, string hasVisibility, string hasWhereClause
+  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, "getNumberOfAttrs:", getNumberOfAttrs, "hasGenericParamList:", hasGenericParamList,
-  "hasName:", hasName, "hasRecordFieldList:", hasRecordFieldList, "hasVisibility:", hasVisibility,
+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_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/Use/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/extractor-tests/generated/Use/CONSISTENCY/DataFlowConsistency.expected
new file mode 100644
index 00000000000..87bf4d39856
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Use/CONSISTENCY/DataFlowConsistency.expected
@@ -0,0 +1,2 @@
+uniqueCallEnclosingCallable
+| gen_use.rs:5:5:5:11 | CallExpr | Call should have one enclosing callable but has 0. |
diff --git a/rust/ql/test/extractor-tests/generated/Use/Use.ql b/rust/ql/test/extractor-tests/generated/Use/Use.ql
index 1a03f16786b..b88b3a69332 100644
--- a/rust/ql/test/extractor-tests/generated/Use/Use.ql
+++ b/rust/ql/test/extractor-tests/generated/Use/Use.ql
@@ -2,12 +2,20 @@
 import codeql.rust.elements
 import TestUtils
 
-from Use x, int getNumberOfAttrs, string hasUseTree, string hasVisibility
+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, "getNumberOfAttrs:", getNumberOfAttrs, "hasUseTree:", hasUseTree, "hasVisibility:",
-  hasVisibility
+select x, "hasExtendedCanonicalPath:", hasExtendedCanonicalPath, "hasCrateOrigin:", hasCrateOrigin,
+  "getNumberOfAttrs:", getNumberOfAttrs, "hasUseTree:", hasUseTree, "hasVisibility:", hasVisibility
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/UseTree/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/extractor-tests/generated/UseTree/CONSISTENCY/DataFlowConsistency.expected
new file mode 100644
index 00000000000..11abacff6a1
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/UseTree/CONSISTENCY/DataFlowConsistency.expected
@@ -0,0 +1,2 @@
+uniqueCallEnclosingCallable
+| gen_use_tree.rs:5:5:5:11 | CallExpr | Call should have one enclosing callable but has 0. |
diff --git a/rust/ql/test/extractor-tests/generated/UseTreeList/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/extractor-tests/generated/UseTreeList/CONSISTENCY/DataFlowConsistency.expected
new file mode 100644
index 00000000000..d71404dcd00
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/UseTreeList/CONSISTENCY/DataFlowConsistency.expected
@@ -0,0 +1,2 @@
+uniqueCallEnclosingCallable
+| gen_use_tree_list.rs:5:5:5:11 | CallExpr | Call should have one enclosing callable but has 0. |
diff --git a/rust/ql/test/extractor-tests/generated/Variant/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/extractor-tests/generated/Variant/CONSISTENCY/DataFlowConsistency.expected
new file mode 100644
index 00000000000..1a8eb7a7998
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Variant/CONSISTENCY/DataFlowConsistency.expected
@@ -0,0 +1,2 @@
+uniqueCallEnclosingCallable
+| gen_variant.rs:5:5:5:11 | CallExpr | Call should have one enclosing callable but has 0. |
diff --git a/rust/ql/test/extractor-tests/generated/VariantList/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/extractor-tests/generated/VariantList/CONSISTENCY/DataFlowConsistency.expected
new file mode 100644
index 00000000000..91db48d1f7f
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/VariantList/CONSISTENCY/DataFlowConsistency.expected
@@ -0,0 +1,2 @@
+uniqueCallEnclosingCallable
+| gen_variant_list.rs:5:5:5:11 | CallExpr | Call should have one enclosing callable but has 0. |
diff --git a/rust/ql/test/extractor-tests/generated/Visibility/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/extractor-tests/generated/Visibility/CONSISTENCY/DataFlowConsistency.expected
new file mode 100644
index 00000000000..a5177a30c8a
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Visibility/CONSISTENCY/DataFlowConsistency.expected
@@ -0,0 +1,2 @@
+uniqueCallEnclosingCallable
+| gen_visibility.rs:5:5:5:11 | CallExpr | Call should have one enclosing callable but has 0. |
diff --git a/rust/ql/test/extractor-tests/generated/WhereClause/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/extractor-tests/generated/WhereClause/CONSISTENCY/DataFlowConsistency.expected
new file mode 100644
index 00000000000..9e96d82eac4
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/WhereClause/CONSISTENCY/DataFlowConsistency.expected
@@ -0,0 +1,2 @@
+uniqueCallEnclosingCallable
+| gen_where_clause.rs:5:5:5:11 | CallExpr | Call should have one enclosing callable but has 0. |
diff --git a/rust/ql/test/extractor-tests/generated/WherePred/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/extractor-tests/generated/WherePred/CONSISTENCY/DataFlowConsistency.expected
new file mode 100644
index 00000000000..8bc406e404e
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/WherePred/CONSISTENCY/DataFlowConsistency.expected
@@ -0,0 +1,2 @@
+uniqueCallEnclosingCallable
+| gen_where_pred.rs:5:5:5:11 | CallExpr | Call should have one enclosing callable but has 0. |
diff --git a/rust/ql/test/extractor-tests/generated/WhileExpr/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/extractor-tests/generated/WhileExpr/CONSISTENCY/DataFlowConsistency.expected
new file mode 100644
index 00000000000..ead953dbf8e
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/WhileExpr/CONSISTENCY/DataFlowConsistency.expected
@@ -0,0 +1,2 @@
+uniqueCallEnclosingCallable
+| gen_while_expr.rs:5:5:5:11 | CallExpr | Call should have one enclosing callable but has 0. |
diff --git a/rust/ql/test/extractor-tests/generated/options b/rust/ql/test/extractor-tests/generated/options
new file mode 100644
index 00000000000..cf148dd35f8
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/options
@@ -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
index b0a4dfe0091..5586f36b0ac 100644
--- a/rust/ql/test/extractor-tests/utf8/ast.expected
+++ b/rust/ql/test/extractor-tests/utf8/ast.expected
@@ -1,6 +1,6 @@
-| lib.rs:1:1:2:22 | SourceFile |
-| lib.rs:2:1:2:21 | Module |
-| lib.rs:2:5:2:20 | Name |
+| lib.rs:1:1:1:21 | Module |
+| lib.rs:1:1:1:21 | SourceFile |
+| lib.rs:1:5:1:20 | Name |
 | utf8_identifiers.rs:1:1:4:6 | foo |
 | utf8_identifiers.rs:1:1:12:2 | SourceFile |
 | utf8_identifiers.rs:1:4:1:6 | Name |
diff --git a/rust/ql/test/library-tests/controlflow/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/library-tests/controlflow/CONSISTENCY/DataFlowConsistency.expected
new file mode 100644
index 00000000000..31b84f91462
--- /dev/null
+++ b/rust/ql/test/library-tests/controlflow/CONSISTENCY/DataFlowConsistency.expected
@@ -0,0 +1,114 @@
+uniqueEnclosingCallable
+| test.rs:18:32:18:37 | Param | Node should have one enclosing callable but has 0. |
+| test.rs:36:31:36:37 | Param | Node should have one enclosing callable but has 0. |
+| test.rs:50:34:50:40 | Param | Node should have one enclosing callable but has 0. |
+| test.rs:64:34:64:40 | Param | Node should have one enclosing callable but has 0. |
+| test.rs:78:19:78:24 | Param | Node should have one enclosing callable but has 0. |
+| test.rs:98:17:98:22 | Param | Node should have one enclosing callable but has 0. |
+| test.rs:114:25:114:30 | Param | Node should have one enclosing callable but has 0. |
+| test.rs:115:20:115:20 | Param | Node should have one enclosing callable but has 0. |
+| test.rs:121:21:121:26 | Param | Node should have one enclosing callable but has 0. |
+| test.rs:129:25:129:38 | Param | Node should have one enclosing callable but has 0. |
+| test.rs:137:20:137:33 | Param | Node should have one enclosing callable but has 0. |
+| test.rs:144:23:144:28 | Param | Node should have one enclosing callable but has 0. |
+| test.rs:152:29:152:34 | Param | Node should have one enclosing callable but has 0. |
+| test.rs:163:29:163:34 | Param | Node should have one enclosing callable but has 0. |
+| test.rs:174:27:174:32 | Param | Node should have one enclosing callable but has 0. |
+| test.rs:183:22:183:27 | Param | Node should have one enclosing callable but has 0. |
+| test.rs:196:22:196:27 | Param | Node should have one enclosing callable but has 0. |
+| test.rs:209:28:209:33 | Param | Node should have one enclosing callable but has 0. |
+| test.rs:222:26:222:32 | Param | Node should have one enclosing callable but has 0. |
+| test.rs:222:35:222:41 | Param | Node should have one enclosing callable but has 0. |
+| test.rs:222:44:222:50 | Param | Node should have one enclosing callable but has 0. |
+| test.rs:227:25:227:31 | Param | Node should have one enclosing callable but has 0. |
+| test.rs:227:34:227:40 | Param | Node should have one enclosing callable but has 0. |
+| test.rs:227:43:227:49 | Param | Node should have one enclosing callable but has 0. |
+| test.rs:232:27:232:33 | Param | Node should have one enclosing callable but has 0. |
+| test.rs:232:36:232:41 | Param | Node should have one enclosing callable but has 0. |
+| test.rs:232:44:232:50 | Param | Node should have one enclosing callable but has 0. |
+| test.rs:237:26:237:32 | Param | Node should have one enclosing callable but has 0. |
+| test.rs:242:29:242:35 | Param | Node should have one enclosing callable but has 0. |
+| test.rs:242:38:242:43 | Param | Node should have one enclosing callable but has 0. |
+| test.rs:242:46:242:52 | Param | Node should have one enclosing callable but has 0. |
+| test.rs:250:28:250:34 | Param | Node should have one enclosing callable but has 0. |
+| test.rs:250:37:250:42 | Param | Node should have one enclosing callable but has 0. |
+| test.rs:250:45:250:51 | Param | Node should have one enclosing callable but has 0. |
+| test.rs:258:29:258:35 | Param | Node should have one enclosing callable but has 0. |
+| test.rs:269:38:269:44 | Param | Node should have one enclosing callable but has 0. |
+| test.rs:273:38:273:52 | Param | Node should have one enclosing callable but has 0. |
+| test.rs:283:19:283:42 | Param | Node should have one enclosing callable but has 0. |
+| test.rs:291:44:291:67 | Param | Node should have one enclosing callable but has 0. |
+| test.rs:302:23:302:32 | Param | Node should have one enclosing callable but has 0. |
+| test.rs:302:35:302:48 | Param | Node should have one enclosing callable but has 0. |
+| test.rs:309:35:309:58 | Param | Node should have one enclosing callable but has 0. |
+| test.rs:319:23:319:36 | Param | Node should have one enclosing callable but has 0. |
+| test.rs:324:29:324:42 | Param | Node should have one enclosing callable but has 0. |
+| test.rs:335:28:335:35 | Param | Node should have one enclosing callable but has 0. |
+| test.rs:342:29:342:40 | Param | Node should have one enclosing callable but has 0. |
+| test.rs:401:15:401:25 | Param | Node should have one enclosing callable but has 0. |
+| test.rs:408:16:408:19 | Param | Node should have one enclosing callable but has 0. |
+uniqueCallEnclosingCallable
+| test.rs:6:9:6:44 | CallExpr | Call should have one enclosing callable but has 0. |
+| test.rs:7:9:7:27 | CallExpr | Call should have one enclosing callable but has 0. |
+| test.rs:11:23:11:36 | CallExpr | Call should have one enclosing callable but has 0. |
+| test.rs:21:17:21:23 | CallExpr | Call should have one enclosing callable but has 0. |
+| test.rs:116:5:116:23 | CallExpr | Call should have one enclosing callable but has 0. |
+| test.rs:116:13:116:22 | CallExpr | Call should have one enclosing callable but has 0. |
+| test.rs:275:21:275:31 | CallExpr | Call should have one enclosing callable but has 0. |
+| test.rs:276:22:276:31 | CallExpr | Call should have one enclosing callable but has 0. |
+| test.rs:292:34:292:40 | CallExpr | Call should have one enclosing callable but has 0. |
+| test.rs:376:9:376:18 | CallExpr | Call should have one enclosing callable but has 0. |
+| test.rs:377:12:377:30 | CallExpr | Call should have one enclosing callable but has 0. |
+| test.rs:380:9:380:23 | CallExpr | Call should have one enclosing callable but has 0. |
+| test.rs:381:12:381:30 | CallExpr | Call should have one enclosing callable but has 0. |
+| test.rs:384:9:384:23 | CallExpr | Call should have one enclosing callable but has 0. |
+| test.rs:404:5:404:18 | CallExpr | Call should have one enclosing callable but has 0. |
+uniqueType
+| test.rs:18:32:18:37 | Param | Node should have one type but has 0. |
+| test.rs:36:31:36:37 | Param | Node should have one type but has 0. |
+| test.rs:50:34:50:40 | Param | Node should have one type but has 0. |
+| test.rs:64:34:64:40 | Param | Node should have one type but has 0. |
+| test.rs:78:19:78:24 | Param | Node should have one type but has 0. |
+| test.rs:98:17:98:22 | Param | Node should have one type but has 0. |
+| test.rs:114:25:114:30 | Param | Node should have one type but has 0. |
+| test.rs:115:20:115:20 | Param | Node should have one type but has 0. |
+| test.rs:121:21:121:26 | Param | Node should have one type but has 0. |
+| test.rs:129:25:129:38 | Param | Node should have one type but has 0. |
+| test.rs:137:20:137:33 | Param | Node should have one type but has 0. |
+| test.rs:144:23:144:28 | Param | Node should have one type but has 0. |
+| test.rs:152:29:152:34 | Param | Node should have one type but has 0. |
+| test.rs:163:29:163:34 | Param | Node should have one type but has 0. |
+| test.rs:174:27:174:32 | Param | Node should have one type but has 0. |
+| test.rs:183:22:183:27 | Param | Node should have one type but has 0. |
+| test.rs:196:22:196:27 | Param | Node should have one type but has 0. |
+| test.rs:209:28:209:33 | Param | Node should have one type but has 0. |
+| test.rs:222:26:222:32 | Param | Node should have one type but has 0. |
+| test.rs:222:35:222:41 | Param | Node should have one type but has 0. |
+| test.rs:222:44:222:50 | Param | Node should have one type but has 0. |
+| test.rs:227:25:227:31 | Param | Node should have one type but has 0. |
+| test.rs:227:34:227:40 | Param | Node should have one type but has 0. |
+| test.rs:227:43:227:49 | Param | Node should have one type but has 0. |
+| test.rs:232:27:232:33 | Param | Node should have one type but has 0. |
+| test.rs:232:36:232:41 | Param | Node should have one type but has 0. |
+| test.rs:232:44:232:50 | Param | Node should have one type but has 0. |
+| test.rs:237:26:237:32 | Param | Node should have one type but has 0. |
+| test.rs:242:29:242:35 | Param | Node should have one type but has 0. |
+| test.rs:242:38:242:43 | Param | Node should have one type but has 0. |
+| test.rs:242:46:242:52 | Param | Node should have one type but has 0. |
+| test.rs:250:28:250:34 | Param | Node should have one type but has 0. |
+| test.rs:250:37:250:42 | Param | Node should have one type but has 0. |
+| test.rs:250:45:250:51 | Param | Node should have one type but has 0. |
+| test.rs:258:29:258:35 | Param | Node should have one type but has 0. |
+| test.rs:269:38:269:44 | Param | Node should have one type but has 0. |
+| test.rs:273:38:273:52 | Param | Node should have one type but has 0. |
+| test.rs:283:19:283:42 | Param | Node should have one type but has 0. |
+| test.rs:291:44:291:67 | Param | Node should have one type but has 0. |
+| test.rs:302:23:302:32 | Param | Node should have one type but has 0. |
+| test.rs:302:35:302:48 | Param | Node should have one type but has 0. |
+| test.rs:309:35:309:58 | Param | Node should have one type but has 0. |
+| test.rs:319:23:319:36 | Param | Node should have one type but has 0. |
+| test.rs:324:29:324:42 | Param | Node should have one type but has 0. |
+| test.rs:335:28:335:35 | Param | Node should have one type but has 0. |
+| test.rs:342:29:342:40 | Param | Node should have one type but has 0. |
+| test.rs:401:15:401:25 | Param | Node should have one type but has 0. |
+| test.rs:408:16:408:19 | Param | Node should have one type but has 0. |
diff --git a/rust/ql/test/library-tests/controlflow/Cfg.expected b/rust/ql/test/library-tests/controlflow/Cfg.expected
index 42f39dfec83..cdbf56592c9 100644
--- a/rust/ql/test/library-tests/controlflow/Cfg.expected
+++ b/rust/ql/test/library-tests/controlflow/Cfg.expected
@@ -1,751 +1,862 @@
 edges
-| test.rs:1:1:4:1 | enter test_call | test.rs:2:5:2:41 | ExprStmt |  |
-| test.rs:1:1:4:1 | exit test_call (normal) | test.rs:1:1:4:1 | exit test_call |  |
-| test.rs:1:24:4:1 | BlockExpr | test.rs:1:1:4:1 | exit test_call (normal) |  |
-| test.rs:2:5:2:21 | PathExpr | test.rs:2:23:2:26 | true |  |
-| test.rs:2:5:2:40 | CallExpr | test.rs:3:5:3:24 | ExprStmt |  |
-| test.rs:2:5:2:41 | ExprStmt | test.rs:2:5:2:21 | PathExpr |  |
-| test.rs:2:23:2:26 | true | test.rs:2:29:2:33 | false |  |
-| test.rs:2:29:2:33 | false | test.rs:2:36:2:39 | true |  |
-| test.rs:2:36:2:39 | true | test.rs:2:5:2:40 | CallExpr |  |
-| test.rs:3:5:3:19 | PathExpr | test.rs:3:21:3:22 | 42 |  |
-| test.rs:3:5:3:23 | CallExpr | test.rs:1:24:4:1 | BlockExpr |  |
-| test.rs:3:5:3:24 | ExprStmt | test.rs:3:5:3:19 | PathExpr |  |
-| test.rs:3:21:3:22 | 42 | test.rs:3:5:3:23 | CallExpr |  |
-| test.rs:8:5:24:5 | enter test_break_and_continue | test.rs:8:32:8:32 | n |  |
-| test.rs:8:5:24:5 | exit test_break_and_continue (normal) | test.rs:8:5:24:5 | exit test_break_and_continue |  |
-| test.rs:8:32:8:32 | n | test.rs:8:32:8:37 | Param | match |
-| test.rs:8:32:8:37 | Param | test.rs:9:9:9:22 | LetStmt |  |
-| test.rs:9:9:9:22 | LetStmt | test.rs:9:21:9:21 | n |  |
-| test.rs:9:13:9:17 | i | test.rs:10:9:22:9 | ExprStmt | match |
-| test.rs:9:21:9:21 | n | test.rs:9:13:9:17 | i |  |
-| test.rs:10:9:22:9 | ExprStmt | test.rs:11:13:11:24 | ExprStmt |  |
-| test.rs:10:9:22:9 | LoopExpr | test.rs:23:9:23:20 | ExprStmt |  |
-| test.rs:10:14:22:9 | BlockExpr | test.rs:11:13:11:24 | ExprStmt |  |
-| test.rs:11:13:11:13 | i | test.rs:11:17:11:20 | PathExpr |  |
-| test.rs:11:13:11:23 | ... = ... | test.rs:12:13:14:13 | ExprStmt |  |
-| test.rs:11:13:11:24 | ExprStmt | test.rs:11:13:11:13 | i |  |
-| test.rs:11:17:11:20 | PathExpr | test.rs:11:22:11:22 | i |  |
-| test.rs:11:17:11:23 | CallExpr | test.rs:11:13:11:23 | ... = ... |  |
-| test.rs:11:22:11:22 | i | test.rs:11:17:11:23 | CallExpr |  |
-| test.rs:12:13:14:13 | ExprStmt | test.rs:12:16:12:16 | i |  |
-| test.rs:12:13:14:13 | IfExpr | test.rs:15:13:17:13 | ExprStmt |  |
-| test.rs:12:16:12:16 | i | test.rs:12:20:12:24 | 10000 |  |
-| test.rs:12:16:12:24 | ... > ... | test.rs:12:13:14:13 | IfExpr | false |
-| test.rs:12:16:12:24 | ... > ... | test.rs:13:17:13:29 | ExprStmt | true |
-| test.rs:12:20:12:24 | 10000 | test.rs:12:16:12:24 | ... > ... |  |
-| test.rs:13:17:13:28 | ReturnExpr | test.rs:8:5:24:5 | exit test_break_and_continue (normal) | return |
-| test.rs:13:17:13:29 | ExprStmt | test.rs:13:24:13:28 | false |  |
-| test.rs:13:24:13:28 | false | test.rs:13:17:13:28 | ReturnExpr |  |
-| test.rs:15:13:17:13 | ExprStmt | test.rs:15:16:15:16 | i |  |
-| test.rs:15:13:17:13 | IfExpr | test.rs:18:13:20:13 | ExprStmt |  |
-| test.rs:15:16:15:16 | i | test.rs:15:21:15:21 | 1 |  |
-| test.rs:15:16:15:21 | ... == ... | test.rs:15:13:17:13 | IfExpr | false |
-| test.rs:15:16:15:21 | ... == ... | test.rs:16:17:16:22 | ExprStmt | true |
-| test.rs:15:21:15:21 | 1 | test.rs:15:16:15:21 | ... == ... |  |
-| test.rs:16:17:16:21 | BreakExpr | test.rs:10:9:22:9 | LoopExpr | break |
-| test.rs:16:17:16:22 | ExprStmt | test.rs:16:17:16:21 | BreakExpr |  |
-| test.rs:18:13:20:13 | ExprStmt | test.rs:18:16:18:16 | i |  |
-| test.rs:18:13:20:13 | IfExpr | test.rs:21:13:21:13 | i |  |
-| test.rs:18:16:18:16 | i | test.rs:18:20:18:20 | 2 |  |
-| test.rs:18:16:18:20 | ... % ... | test.rs:18:25:18:25 | 0 |  |
-| test.rs:18:16:18:25 | ... != ... | test.rs:18:13:20:13 | IfExpr | false |
-| test.rs:18:16:18:25 | ... != ... | test.rs:19:17:19:25 | ExprStmt | true |
-| test.rs:18:20:18:20 | 2 | test.rs:18:16:18:20 | ... % ... |  |
-| test.rs:18:25:18:25 | 0 | test.rs:18:16:18:25 | ... != ... |  |
-| test.rs:19:17:19:24 | ContinueExpr | test.rs:11:13:11:24 | ExprStmt | continue |
-| test.rs:19:17:19:25 | ExprStmt | test.rs:19:17:19:24 | ContinueExpr |  |
-| test.rs:21:13:21:13 | i | test.rs:21:17:21:17 | i |  |
-| test.rs:21:13:21:21 | ... = ... | test.rs:10:14:22:9 | BlockExpr |  |
-| test.rs:21:17:21:17 | i | test.rs:21:21:21:21 | 2 |  |
-| test.rs:21:17:21:21 | ... / ... | test.rs:21:13:21:21 | ... = ... |  |
-| test.rs:21:21:21:21 | 2 | test.rs:21:17:21:21 | ... / ... |  |
-| test.rs:23:9:23:19 | ReturnExpr | test.rs:8:5:24:5 | exit test_break_and_continue (normal) | return |
-| test.rs:23:9:23:20 | ExprStmt | test.rs:23:16:23:19 | true |  |
-| test.rs:23:16:23:19 | true | test.rs:23:9:23:19 | ReturnExpr |  |
-| test.rs:26:5:38:5 | enter test_break_with_labels | test.rs:26:31:26:31 | b |  |
-| test.rs:26:5:38:5 | exit test_break_with_labels (normal) | test.rs:26:5:38:5 | exit test_break_with_labels |  |
-| test.rs:26:31:26:31 | b | test.rs:26:31:26:37 | Param | match |
-| test.rs:26:31:26:37 | Param | test.rs:27:9:36:9 | ExprStmt |  |
-| test.rs:26:48:38:5 | BlockExpr | test.rs:26:5:38:5 | exit test_break_with_labels (normal) |  |
-| test.rs:27:9:36:9 | ExprStmt | test.rs:29:17:33:17 | ExprStmt |  |
-| test.rs:27:9:36:9 | LoopExpr | test.rs:37:9:37:12 | true |  |
-| test.rs:27:22:36:9 | BlockExpr | test.rs:29:17:33:17 | ExprStmt |  |
-| test.rs:28:13:35:13 | LoopExpr | test.rs:27:22:36:9 | BlockExpr |  |
-| test.rs:29:17:33:17 | ExprStmt | test.rs:29:20:29:20 | b |  |
-| test.rs:29:17:33:17 | IfExpr | test.rs:34:17:34:29 | ExprStmt |  |
-| test.rs:29:20:29:20 | b | test.rs:30:21:30:26 | ExprStmt | true |
-| test.rs:29:20:29:20 | b | test.rs:31:27:31:27 | b | false |
-| test.rs:30:21:30:25 | BreakExpr | test.rs:28:13:35:13 | LoopExpr | break |
-| test.rs:30:21:30:26 | ExprStmt | test.rs:30:21:30:25 | BreakExpr |  |
-| test.rs:31:24:33:17 | IfExpr | test.rs:29:17:33:17 | IfExpr |  |
-| test.rs:31:27:31:27 | b | test.rs:31:24:33:17 | IfExpr | false |
-| test.rs:31:27:31:27 | b | test.rs:32:21:32:33 | ExprStmt | true |
-| test.rs:32:21:32:32 | BreakExpr | test.rs:27:9:36:9 | LoopExpr | break |
-| test.rs:32:21:32:33 | ExprStmt | test.rs:32:21:32:32 | BreakExpr |  |
-| test.rs:34:17:34:28 | BreakExpr | test.rs:28:13:35:13 | LoopExpr | break |
-| test.rs:34:17:34:29 | ExprStmt | test.rs:34:17:34:28 | BreakExpr |  |
-| test.rs:37:9:37:12 | true | test.rs:26:48:38:5 | BlockExpr |  |
-| test.rs:40:5:52:5 | enter test_continue_with_labels | test.rs:40:34:40:34 | b |  |
-| test.rs:40:34:40:34 | b | test.rs:40:34:40:40 | Param | match |
-| test.rs:40:34:40:40 | Param | test.rs:42:13:42:14 | ExprStmt |  |
-| test.rs:42:13:42:13 | 1 | test.rs:44:17:48:17 | ExprStmt |  |
-| test.rs:42:13:42:14 | ExprStmt | test.rs:42:13:42:13 | 1 |  |
-| test.rs:44:17:48:17 | ExprStmt | test.rs:44:20:44:20 | b |  |
-| test.rs:44:17:48:17 | IfExpr | test.rs:49:17:49:32 | ExprStmt |  |
-| test.rs:44:20:44:20 | b | test.rs:45:21:45:29 | ExprStmt | true |
-| test.rs:44:20:44:20 | b | test.rs:46:27:46:27 | b | false |
-| test.rs:45:21:45:28 | ContinueExpr | test.rs:44:17:48:17 | ExprStmt | continue |
-| test.rs:45:21:45:29 | ExprStmt | test.rs:45:21:45:28 | ContinueExpr |  |
-| test.rs:46:24:48:17 | IfExpr | test.rs:44:17:48:17 | IfExpr |  |
-| test.rs:46:27:46:27 | b | test.rs:46:24:48:17 | IfExpr | false |
-| test.rs:46:27:46:27 | b | test.rs:47:21:47:36 | ExprStmt | true |
-| test.rs:47:21:47:35 | ContinueExpr | test.rs:42:13:42:14 | ExprStmt | continue |
-| test.rs:47:21:47:36 | ExprStmt | test.rs:47:21:47:35 | ContinueExpr |  |
-| test.rs:49:17:49:31 | ContinueExpr | test.rs:44:17:48:17 | ExprStmt | continue |
-| test.rs:49:17:49:32 | ExprStmt | test.rs:49:17:49:31 | ContinueExpr |  |
-| test.rs:54:5:66:5 | enter test_loop_label_shadowing | test.rs:54:34:54:34 | b |  |
-| test.rs:54:34:54:34 | b | test.rs:54:34:54:40 | Param | match |
-| test.rs:54:34:54:40 | Param | test.rs:56:13:56:14 | ExprStmt |  |
-| test.rs:56:13:56:13 | 1 | test.rs:58:17:62:17 | ExprStmt |  |
-| test.rs:56:13:56:14 | ExprStmt | test.rs:56:13:56:13 | 1 |  |
-| test.rs:58:17:62:17 | ExprStmt | test.rs:58:20:58:20 | b |  |
-| test.rs:58:17:62:17 | IfExpr | test.rs:63:17:63:31 | ExprStmt |  |
-| test.rs:58:20:58:20 | b | test.rs:59:21:59:29 | ExprStmt | true |
-| test.rs:58:20:58:20 | b | test.rs:60:27:60:27 | b | false |
-| test.rs:59:21:59:28 | ContinueExpr | test.rs:58:17:62:17 | ExprStmt | continue |
-| test.rs:59:21:59:29 | ExprStmt | test.rs:59:21:59:28 | ContinueExpr |  |
-| test.rs:60:24:62:17 | IfExpr | test.rs:58:17:62:17 | IfExpr |  |
-| test.rs:60:27:60:27 | b | test.rs:60:24:62:17 | IfExpr | false |
-| test.rs:60:27:60:27 | b | test.rs:61:21:61:35 | ExprStmt | true |
-| test.rs:61:21:61:34 | ContinueExpr | test.rs:58:17:62:17 | ExprStmt | continue |
-| test.rs:61:21:61:35 | ExprStmt | test.rs:61:21:61:34 | ContinueExpr |  |
-| test.rs:63:17:63:30 | ContinueExpr | test.rs:58:17:62:17 | ExprStmt | continue |
-| test.rs:63:17:63:31 | ExprStmt | test.rs:63:17:63:30 | ContinueExpr |  |
-| test.rs:68:5:77:5 | enter test_while | test.rs:68:19:68:19 | i |  |
-| test.rs:68:5:77:5 | exit test_while (normal) | test.rs:68:5:77:5 | exit test_while |  |
-| test.rs:68:19:68:19 | i | test.rs:68:19:68:24 | Param | match |
-| test.rs:68:19:68:24 | Param | test.rs:69:9:69:25 | LetStmt |  |
-| test.rs:68:27:77:5 | BlockExpr | test.rs:68:5:77:5 | exit test_while (normal) |  |
-| test.rs:69:9:69:25 | LetStmt | test.rs:69:21:69:24 | true |  |
-| test.rs:69:13:69:17 | b | test.rs:70:15:70:15 | b | match |
-| test.rs:69:21:69:24 | true | test.rs:69:13:69:17 | b |  |
-| test.rs:70:9:76:9 | WhileExpr | test.rs:68:27:77:5 | BlockExpr |  |
-| test.rs:70:15:70:15 | b | test.rs:70:9:76:9 | WhileExpr | false |
-| test.rs:70:15:70:15 | b | test.rs:71:13:71:14 | ExprStmt | true |
-| test.rs:70:17:76:9 | BlockExpr | test.rs:70:15:70:15 | b |  |
-| test.rs:71:13:71:13 | 1 | test.rs:72:13:74:13 | ExprStmt |  |
-| test.rs:71:13:71:14 | ExprStmt | test.rs:71:13:71:13 | 1 |  |
-| test.rs:72:13:74:13 | ExprStmt | test.rs:72:17:72:17 | i |  |
-| test.rs:72:13:74:13 | IfExpr | test.rs:75:13:75:22 | ExprStmt |  |
-| test.rs:72:17:72:17 | i | test.rs:72:21:72:21 | 0 |  |
-| test.rs:72:17:72:21 | ... > ... | test.rs:72:13:74:13 | IfExpr | false |
-| test.rs:72:17:72:21 | ... > ... | test.rs:73:17:73:22 | ExprStmt | true |
-| test.rs:72:21:72:21 | 0 | test.rs:72:17:72:21 | ... > ... |  |
-| test.rs:73:17:73:21 | BreakExpr | test.rs:70:9:76:9 | WhileExpr | break |
-| test.rs:73:17:73:22 | ExprStmt | test.rs:73:17:73:21 | BreakExpr |  |
-| test.rs:75:13:75:13 | b | test.rs:75:17:75:21 | false |  |
-| test.rs:75:13:75:21 | ... = ... | test.rs:70:17:76:9 | BlockExpr |  |
-| test.rs:75:13:75:22 | ExprStmt | test.rs:75:13:75:13 | b |  |
-| test.rs:75:17:75:21 | false | test.rs:75:13:75:21 | ... = ... |  |
-| test.rs:79:5:86:5 | enter test_while_let | test.rs:80:9:80:29 | LetStmt |  |
-| test.rs:79:5:86:5 | exit test_while_let (normal) | test.rs:79:5:86:5 | exit test_while_let |  |
-| test.rs:79:25:86:5 | BlockExpr | test.rs:79:5:86:5 | exit test_while_let (normal) |  |
-| test.rs:80:9:80:29 | LetStmt | test.rs:80:24:80:24 | 1 |  |
-| test.rs:80:13:80:20 | iter | test.rs:81:15:81:39 | LetExpr | match |
-| test.rs:80:24:80:24 | 1 | test.rs:80:27:80:28 | 10 |  |
-| test.rs:80:24:80:28 | RangeExpr | test.rs:80:13:80:20 | iter |  |
-| test.rs:80:27:80:28 | 10 | test.rs:80:24:80:28 | RangeExpr |  |
-| test.rs:81:9:85:9 | WhileExpr | test.rs:79:25:86:5 | BlockExpr |  |
-| test.rs:81:15:81:39 | LetExpr | test.rs:81:29:81:32 | iter |  |
-| test.rs:81:19:81:25 | TupleStructPat | test.rs:81:9:85:9 | WhileExpr | no-match |
-| test.rs:81:19:81:25 | TupleStructPat | test.rs:81:24:81:24 | x | match |
-| test.rs:81:24:81:24 | x | test.rs:82:17:82:17 | PathExpr | match |
-| test.rs:81:29:81:32 | iter | test.rs:81:29:81:39 | MethodCallExpr |  |
-| test.rs:81:29:81:39 | MethodCallExpr | test.rs:81:19:81:25 | TupleStructPat |  |
-| test.rs:81:41:85:9 | BlockExpr | test.rs:81:15:81:39 | LetExpr |  |
-| test.rs:82:13:84:13 | IfExpr | test.rs:81:41:85:9 | BlockExpr |  |
-| test.rs:82:17:82:17 | PathExpr | test.rs:82:21:82:21 | 5 |  |
-| test.rs:82:17:82:21 | ... = ... | test.rs:82:13:84:13 | IfExpr | false |
-| test.rs:82:17:82:21 | ... = ... | test.rs:83:17:83:22 | ExprStmt | true |
-| test.rs:82:21:82:21 | 5 | test.rs:82:17:82:21 | ... = ... |  |
-| test.rs:83:17:83:21 | BreakExpr | test.rs:81:9:85:9 | WhileExpr | break |
+| test.rs:5:5:8:5 | enter function_call | test.rs:6:9:6:45 | 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:25 | PathExpr | test.rs:6:27:6:30 | true |  |
+| test.rs:6:9:6:44 | CallExpr | test.rs:7:9:7:28 | ExprStmt |  |
+| test.rs:6:9:6:45 | ExprStmt | test.rs:6:9:6:25 | PathExpr |  |
+| test.rs:6:27:6:30 | true | test.rs:6:33:6:37 | false |  |
+| test.rs:6:33:6:37 | false | test.rs:6:40:6:43 | true |  |
+| test.rs:6:40:6:43 | true | test.rs:6:9:6:44 | CallExpr |  |
+| test.rs:7:9:7:23 | PathExpr | test.rs:7:25:7:26 | 42 |  |
+| test.rs:7:9:7:27 | CallExpr | test.rs:5:24:8:5 | BlockExpr |  |
+| test.rs:7:9:7:28 | ExprStmt | test.rs:7:9:7:23 | PathExpr |  |
+| test.rs:7:25:7:26 | 42 | test.rs:7:9:7:27 | CallExpr |  |
+| 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 | PathExpr |  |
+| test.rs:11:13:11:19 | map | test.rs:12:9:12:28 | ExprStmt | match |
+| test.rs:11:23:11:34 | PathExpr | 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 | MethodCallExpr | 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 | MethodCallExpr |  |
+| test.rs:18:5:34:5 | enter test_break_and_continue | test.rs:18:32:18:32 | n |  |
+| test.rs:18:5:34:5 | exit test_break_and_continue (normal) | test.rs:18:5:34:5 | exit test_break_and_continue |  |
+| test.rs:18:32:18:32 | n | test.rs:18:32:18:37 | Param | match |
+| test.rs:18:32:18:37 | Param | test.rs:19:9:19:22 | LetStmt |  |
+| test.rs:19:9:19:22 | LetStmt | test.rs:19:21:19:21 | n |  |
+| test.rs:19:13:19:17 | i | test.rs:20:9:32:9 | ExprStmt | match |
+| test.rs:19:21:19:21 | n | test.rs:19:13:19:17 | i |  |
+| test.rs:20:9:32:9 | ExprStmt | test.rs:21:13:21:24 | ExprStmt |  |
+| test.rs:20:9:32:9 | LoopExpr | test.rs:33:9:33:20 | ExprStmt |  |
+| test.rs:20:14:32:9 | BlockExpr | test.rs:21:13:21:24 | ExprStmt |  |
+| test.rs:21:13:21:13 | i | test.rs:21:17:21:20 | PathExpr |  |
+| test.rs:21:13:21:23 | ... = ... | test.rs:22:13:24:13 | ExprStmt |  |
+| test.rs:21:13:21:24 | ExprStmt | test.rs:21:13:21:13 | i |  |
+| test.rs:21:17:21:20 | PathExpr | test.rs:21:22:21:22 | i |  |
+| test.rs:21:17:21:23 | CallExpr | test.rs:21:13:21:23 | ... = ... |  |
+| test.rs:21:22:21:22 | i | test.rs:21:17:21:23 | CallExpr |  |
+| test.rs:22:13:24:13 | ExprStmt | test.rs:22:16:22:16 | i |  |
+| test.rs:22:13:24:13 | IfExpr | test.rs:25:13:27:13 | ExprStmt |  |
+| test.rs:22:16:22:16 | i | test.rs:22:20:22:24 | 10000 |  |
+| test.rs:22:16:22:24 | ... > ... | test.rs:22:13:24:13 | IfExpr | false |
+| test.rs:22:16:22:24 | ... > ... | test.rs:23:17:23:29 | ExprStmt | true |
+| test.rs:22:20:22:24 | 10000 | test.rs:22:16:22:24 | ... > ... |  |
+| test.rs:23:17:23:28 | ReturnExpr | test.rs:18:5:34:5 | exit test_break_and_continue (normal) | return |
+| test.rs:23:17:23:29 | ExprStmt | test.rs:23:24:23:28 | false |  |
+| test.rs:23:24:23:28 | false | test.rs:23:17:23:28 | ReturnExpr |  |
+| test.rs:25:13:27:13 | ExprStmt | test.rs:25:16:25:16 | i |  |
+| test.rs:25:13:27:13 | IfExpr | test.rs:28:13:30:13 | ExprStmt |  |
+| test.rs:25:16:25:16 | i | test.rs:25:21:25:21 | 1 |  |
+| test.rs:25:16:25:21 | ... == ... | test.rs:25:13:27:13 | IfExpr | false |
+| test.rs:25:16:25:21 | ... == ... | test.rs:26:17:26:22 | ExprStmt | true |
+| test.rs:25:21:25:21 | 1 | test.rs:25:16:25:21 | ... == ... |  |
+| test.rs:26:17:26:21 | BreakExpr | test.rs:20:9:32:9 | LoopExpr | break |
+| test.rs:26:17:26:22 | ExprStmt | test.rs:26:17:26:21 | BreakExpr |  |
+| test.rs:28:13:30:13 | ExprStmt | test.rs:28:16:28:16 | i |  |
+| test.rs:28:13:30:13 | IfExpr | test.rs:31:13:31:13 | i |  |
+| test.rs:28:16:28:16 | i | test.rs:28:20:28:20 | 2 |  |
+| test.rs:28:16:28:20 | ... % ... | test.rs:28:25:28:25 | 0 |  |
+| test.rs:28:16:28:25 | ... != ... | test.rs:28:13:30:13 | IfExpr | false |
+| test.rs:28:16:28:25 | ... != ... | test.rs:29:17:29:25 | ExprStmt | true |
+| test.rs:28:20:28:20 | 2 | test.rs:28:16:28:20 | ... % ... |  |
+| test.rs:28:25:28:25 | 0 | test.rs:28:16:28:25 | ... != ... |  |
+| test.rs:29:17:29:24 | ContinueExpr | test.rs:21:13:21:24 | ExprStmt | continue |
+| test.rs:29:17:29:25 | ExprStmt | test.rs:29:17:29:24 | ContinueExpr |  |
+| test.rs:31:13:31:13 | i | test.rs:31:17:31:17 | i |  |
+| test.rs:31:13:31:21 | ... = ... | test.rs:20:14:32:9 | BlockExpr |  |
+| test.rs:31:17:31:17 | i | test.rs:31:21:31:21 | 2 |  |
+| test.rs:31:17:31:21 | ... / ... | test.rs:31:13:31:21 | ... = ... |  |
+| test.rs:31:21:31:21 | 2 | test.rs:31:17:31:21 | ... / ... |  |
+| test.rs:33:9:33:19 | ReturnExpr | test.rs:18:5:34:5 | exit test_break_and_continue (normal) | return |
+| test.rs:33:9:33:20 | ExprStmt | test.rs:33:16:33:19 | true |  |
+| test.rs:33:16:33:19 | true | test.rs:33:9:33:19 | ReturnExpr |  |
+| test.rs:36:5:48:5 | enter test_break_with_labels | test.rs:36:31:36:31 | b |  |
+| test.rs:36:5:48:5 | exit test_break_with_labels (normal) | test.rs:36:5:48:5 | exit test_break_with_labels |  |
+| test.rs:36:31:36:31 | b | test.rs:36:31:36:37 | Param | match |
+| test.rs:36:31:36:37 | Param | test.rs:37:9:46:9 | ExprStmt |  |
+| test.rs:36:48:48:5 | BlockExpr | test.rs:36:5:48:5 | exit test_break_with_labels (normal) |  |
+| test.rs:37:9:46:9 | ExprStmt | test.rs:39:17:43:17 | ExprStmt |  |
+| test.rs:37:9:46:9 | LoopExpr | test.rs:47:9:47:12 | true |  |
+| test.rs:37:22:46:9 | BlockExpr | test.rs:39:17:43:17 | ExprStmt |  |
+| test.rs:38:13:45:13 | LoopExpr | test.rs:37:22:46:9 | BlockExpr |  |
+| test.rs:39:17:43:17 | ExprStmt | test.rs:39:20:39:20 | b |  |
+| test.rs:39:17:43:17 | IfExpr | test.rs:44:17:44:29 | ExprStmt |  |
+| test.rs:39:20:39:20 | b | test.rs:40:21:40:26 | ExprStmt | true |
+| test.rs:39:20:39:20 | b | test.rs:41:27:41:27 | b | false |
+| test.rs:40:21:40:25 | BreakExpr | test.rs:38:13:45:13 | LoopExpr | break |
+| test.rs:40:21:40:26 | ExprStmt | test.rs:40:21:40:25 | BreakExpr |  |
+| test.rs:41:24:43:17 | IfExpr | test.rs:39:17:43:17 | IfExpr |  |
+| test.rs:41:27:41:27 | b | test.rs:41:24:43:17 | IfExpr | false |
+| test.rs:41:27:41:27 | b | test.rs:42:21:42:33 | ExprStmt | true |
+| test.rs:42:21:42:32 | BreakExpr | test.rs:37:9:46:9 | LoopExpr | break |
+| test.rs:42:21:42:33 | ExprStmt | test.rs:42:21:42:32 | BreakExpr |  |
+| test.rs:44:17:44:28 | BreakExpr | test.rs:38:13:45:13 | LoopExpr | break |
+| test.rs:44:17:44:29 | ExprStmt | test.rs:44:17:44:28 | BreakExpr |  |
+| test.rs:47:9:47:12 | true | test.rs:36:48:48:5 | BlockExpr |  |
+| test.rs:50:5:62:5 | enter test_continue_with_labels | test.rs:50:34:50:34 | b |  |
+| test.rs:50:34:50:34 | b | test.rs:50:34:50:40 | Param | match |
+| test.rs:50:34:50:40 | Param | test.rs:52:13:52:14 | ExprStmt |  |
+| test.rs:52:13:52:13 | 1 | test.rs:54:17:58:17 | ExprStmt |  |
+| test.rs:52:13:52:14 | ExprStmt | test.rs:52:13:52:13 | 1 |  |
+| test.rs:54:17:58:17 | ExprStmt | test.rs:54:20:54:20 | b |  |
+| test.rs:54:17:58:17 | IfExpr | test.rs:59:17:59:32 | ExprStmt |  |
+| test.rs:54:20:54:20 | b | test.rs:55:21:55:29 | ExprStmt | true |
+| test.rs:54:20:54:20 | b | test.rs:56:27:56:27 | b | false |
+| test.rs:55:21:55:28 | ContinueExpr | test.rs:54:17:58:17 | ExprStmt | continue |
+| test.rs:55:21:55:29 | ExprStmt | test.rs:55:21:55:28 | ContinueExpr |  |
+| test.rs:56:24:58:17 | IfExpr | test.rs:54:17:58:17 | IfExpr |  |
+| test.rs:56:27:56:27 | b | test.rs:56:24:58:17 | IfExpr | false |
+| test.rs:56:27:56:27 | b | test.rs:57:21:57:36 | ExprStmt | true |
+| test.rs:57:21:57:35 | ContinueExpr | test.rs:52:13:52:14 | ExprStmt | continue |
+| test.rs:57:21:57:36 | ExprStmt | test.rs:57:21:57:35 | ContinueExpr |  |
+| test.rs:59:17:59:31 | ContinueExpr | test.rs:54:17:58:17 | ExprStmt | continue |
+| test.rs:59:17:59:32 | ExprStmt | test.rs:59:17:59:31 | ContinueExpr |  |
+| test.rs:64:5:76:5 | enter test_loop_label_shadowing | test.rs:64:34:64:34 | b |  |
+| test.rs:64:34:64:34 | b | test.rs:64:34:64:40 | Param | match |
+| test.rs:64:34:64:40 | Param | test.rs:66:13:66:14 | ExprStmt |  |
+| test.rs:66:13:66:13 | 1 | test.rs:68:17:72:17 | ExprStmt |  |
+| test.rs:66:13:66:14 | ExprStmt | test.rs:66:13:66:13 | 1 |  |
+| test.rs:68:17:72:17 | ExprStmt | test.rs:68:20:68:20 | b |  |
+| test.rs:68:17:72:17 | IfExpr | test.rs:73:17:73:31 | ExprStmt |  |
+| test.rs:68:20:68:20 | b | test.rs:69:21:69:29 | ExprStmt | true |
+| test.rs:68:20:68:20 | b | test.rs:70:27:70:27 | b | false |
+| test.rs:69:21:69:28 | ContinueExpr | test.rs:68:17:72:17 | ExprStmt | continue |
+| test.rs:69:21:69:29 | ExprStmt | test.rs:69:21:69:28 | ContinueExpr |  |
+| test.rs:70:24:72:17 | IfExpr | test.rs:68:17:72:17 | IfExpr |  |
+| test.rs:70:27:70:27 | b | test.rs:70:24:72:17 | IfExpr | false |
+| test.rs:70:27:70:27 | b | test.rs:71:21:71:35 | ExprStmt | true |
+| test.rs:71:21:71:34 | ContinueExpr | test.rs:68:17:72:17 | ExprStmt | continue |
+| test.rs:71:21:71:35 | ExprStmt | test.rs:71:21:71:34 | ContinueExpr |  |
+| test.rs:73:17:73:30 | ContinueExpr | test.rs:68:17:72:17 | ExprStmt | continue |
+| test.rs:73:17:73:31 | ExprStmt | test.rs:73:17:73:30 | ContinueExpr |  |
+| test.rs:78:5:87:5 | enter test_while | test.rs:78:19:78:19 | i |  |
+| test.rs:78:5:87:5 | exit test_while (normal) | test.rs:78:5:87:5 | exit test_while |  |
+| test.rs:78:19:78:19 | i | test.rs:78:19:78:24 | Param | match |
+| test.rs:78:19:78:24 | Param | test.rs:79:9:79:25 | LetStmt |  |
+| test.rs:78:27:87:5 | BlockExpr | test.rs:78:5:87:5 | exit test_while (normal) |  |
+| test.rs:79:9:79:25 | LetStmt | test.rs:79:21:79:24 | true |  |
+| test.rs:79:13:79:17 | b | test.rs:80:15:80:15 | b | match |
+| test.rs:79:21:79:24 | true | test.rs:79:13:79:17 | b |  |
+| test.rs:80:9:86:9 | WhileExpr | test.rs:78:27:87:5 | BlockExpr |  |
+| test.rs:80:15:80:15 | b | test.rs:80:9:86:9 | WhileExpr | false |
+| test.rs:80:15:80:15 | b | test.rs:81:13:81:14 | ExprStmt | true |
+| test.rs:80:17:86:9 | BlockExpr | test.rs:80:15:80:15 | b |  |
+| test.rs:81:13:81:13 | 1 | test.rs:82:13:84:13 | ExprStmt |  |
+| test.rs:81:13:81:14 | ExprStmt | test.rs:81:13:81:13 | 1 |  |
+| test.rs:82:13:84:13 | ExprStmt | test.rs:82:17:82:17 | i |  |
+| test.rs:82:13:84:13 | IfExpr | test.rs:85:13:85:22 | ExprStmt |  |
+| test.rs:82:17:82:17 | i | test.rs:82:21:82:21 | 0 |  |
+| test.rs:82:17:82:21 | ... > ... | test.rs:82:13:84:13 | IfExpr | false |
+| test.rs:82:17:82:21 | ... > ... | test.rs:83:17:83:22 | ExprStmt | true |
+| test.rs:82:21:82:21 | 0 | test.rs:82:17:82:21 | ... > ... |  |
+| test.rs:83:17:83:21 | BreakExpr | test.rs:80:9:86:9 | WhileExpr | break |
 | test.rs:83:17:83:22 | ExprStmt | test.rs:83:17:83:21 | BreakExpr |  |
-| test.rs:88:5:95:5 | enter test_for | test.rs:88:17:88:17 | j |  |
-| test.rs:88:5:95:5 | exit test_for (normal) | test.rs:88:5:95:5 | exit test_for |  |
-| test.rs:88:17:88:17 | j | test.rs:88:17:88:22 | Param | match |
-| test.rs:88:17:88:22 | Param | test.rs:89:18:89:18 | 0 |  |
-| test.rs:88:25:95:5 | BlockExpr | test.rs:88:5:95:5 | exit test_for (normal) |  |
-| test.rs:89:9:94:9 | ForExpr | test.rs:88:25:95:5 | BlockExpr |  |
-| test.rs:89:13:89:13 | i | test.rs:89:9:94:9 | ForExpr | no-match |
-| test.rs:89:13:89:13 | i | test.rs:90:13:92:13 | ExprStmt | match |
-| test.rs:89:18:89:18 | 0 | test.rs:89:21:89:22 | 10 |  |
-| test.rs:89:18:89:22 | RangeExpr | test.rs:89:13:89:13 | i |  |
-| test.rs:89:21:89:22 | 10 | test.rs:89:18:89:22 | RangeExpr |  |
-| test.rs:89:24:94:9 | BlockExpr | test.rs:89:13:89:13 | i |  |
-| 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:14 | ExprStmt |  |
-| test.rs:90:17:90:17 | i | test.rs:90:22:90:22 | j |  |
-| test.rs:90:17:90:22 | ... == ... | test.rs:90:13:92:13 | IfExpr | false |
-| test.rs:90:17:90:22 | ... == ... | test.rs:91:17:91:22 | ExprStmt | true |
-| test.rs:90:22:90:22 | j | test.rs:90:17:90:22 | ... == ... |  |
-| test.rs:91:17:91:21 | BreakExpr | test.rs:89:9:94:9 | ForExpr | break |
-| test.rs:91:17:91:22 | ExprStmt | test.rs:91:17:91:21 | BreakExpr |  |
-| test.rs:93:13:93:13 | 1 | test.rs:89:24:94:9 | BlockExpr |  |
-| test.rs:93:13:93:14 | ExprStmt | test.rs:93:13:93:13 | 1 |  |
-| test.rs:98:1:101:1 | enter test_nested_function | test.rs:98:25:98:25 | n |  |
-| test.rs:98:1:101:1 | exit test_nested_function (normal) | test.rs:98:1:101:1 | exit test_nested_function |  |
-| test.rs:98:25:98:25 | n | test.rs:98:25:98:30 | Param | match |
-| test.rs:98:25:98:30 | Param | test.rs:99:5:99:28 | LetStmt |  |
-| test.rs:98:40:101:1 | BlockExpr | test.rs:98:1:101:1 | exit test_nested_function (normal) |  |
-| test.rs:99:5:99:28 | LetStmt | test.rs:99:19:99:27 | ClosureExpr |  |
-| test.rs:99:9:99:15 | add_one | test.rs:100:5:100:11 | add_one | match |
-| test.rs:99:19:99:27 | ClosureExpr | test.rs:99:9:99:15 | add_one |  |
-| test.rs:99:19:99:27 | enter ClosureExpr | test.rs:99:20:99:20 | i |  |
-| test.rs:99:19:99:27 | exit ClosureExpr (normal) | test.rs:99:19:99:27 | exit ClosureExpr |  |
-| test.rs:99:20:99:20 | Param | test.rs:99:23:99:23 | i |  |
-| test.rs:99:20:99:20 | i | test.rs:99:20:99:20 | Param | match |
-| test.rs:99:23:99:23 | i | test.rs:99:27:99:27 | 1 |  |
-| test.rs:99:23:99:27 | ... + ... | test.rs:99:19:99:27 | exit ClosureExpr (normal) |  |
-| test.rs:99:27:99:27 | 1 | test.rs:99:23:99:27 | ... + ... |  |
-| test.rs:100:5:100:11 | add_one | test.rs:100:13:100:19 | add_one |  |
-| test.rs:100:5:100:23 | CallExpr | test.rs:98:40:101:1 | BlockExpr |  |
-| test.rs:100:13:100:19 | add_one | test.rs:100:21:100:21 | n |  |
-| test.rs:100:13:100:22 | CallExpr | test.rs:100:5:100:23 | CallExpr |  |
-| test.rs:100:21:100:21 | n | test.rs:100:13:100:22 | CallExpr |  |
-| test.rs:105:5:111:5 | enter test_if_else | test.rs:105:21:105:21 | n |  |
-| test.rs:105:5:111:5 | exit test_if_else (normal) | test.rs:105:5:111:5 | exit test_if_else |  |
-| test.rs:105:21:105:21 | n | test.rs:105:21:105:26 | Param | match |
-| test.rs:105:21:105:26 | Param | test.rs:106:12:106:12 | n |  |
-| test.rs:105:36:111:5 | BlockExpr | test.rs:105:5:111:5 | exit test_if_else (normal) |  |
-| test.rs:106:9:110:9 | IfExpr | test.rs:105:36:111:5 | BlockExpr |  |
-| test.rs:106:12:106:12 | n | test.rs:106:17:106:17 | 0 |  |
-| test.rs:106:12:106:17 | ... <= ... | test.rs:107:13:107:13 | 0 | true |
-| test.rs:106:12:106:17 | ... <= ... | test.rs:109:13:109:13 | n | false |
-| test.rs:106:17:106:17 | 0 | test.rs:106:12:106:17 | ... <= ... |  |
-| test.rs:106:19:108:9 | BlockExpr | test.rs:106:9:110:9 | IfExpr |  |
-| test.rs:107:13:107:13 | 0 | test.rs:106:19:108:9 | BlockExpr |  |
-| test.rs:108:16:110:9 | BlockExpr | test.rs:106:9:110:9 | IfExpr |  |
-| test.rs:109:13:109:13 | n | test.rs:109:17:109:17 | 1 |  |
-| test.rs:109:13:109:17 | ... - ... | test.rs:108:16:110:9 | BlockExpr |  |
-| test.rs:109:17:109:17 | 1 | test.rs:109:13:109:17 | ... - ... |  |
-| test.rs:113:5:119:5 | enter test_if_let_else | test.rs:113:25:113:25 | a |  |
-| test.rs:113:5:119:5 | exit test_if_let_else (normal) | test.rs:113:5:119:5 | exit test_if_let_else |  |
-| test.rs:113:25:113:25 | a | test.rs:113:25:113:38 | Param | match |
-| test.rs:113:25:113:38 | Param | test.rs:114:12:114:26 | LetExpr |  |
-| test.rs:113:48:119:5 | BlockExpr | test.rs:113:5:119:5 | exit test_if_let_else (normal) |  |
-| test.rs:114:9:118:9 | IfExpr | test.rs:113:48:119:5 | BlockExpr |  |
-| test.rs:114:12:114:26 | LetExpr | test.rs:114:26:114:26 | a |  |
-| test.rs:114:16:114:22 | TupleStructPat | test.rs:114:21:114:21 | n | match |
-| test.rs:114:16:114:22 | TupleStructPat | test.rs:117:13:117:13 | 0 | no-match |
-| test.rs:114:21:114:21 | n | test.rs:115:13:115:13 | n | match |
-| test.rs:114:26:114:26 | a | test.rs:114:16:114:22 | TupleStructPat |  |
-| test.rs:114:28:116:9 | BlockExpr | test.rs:114:9:118:9 | IfExpr |  |
-| test.rs:115:13:115:13 | n | test.rs:114:28:116:9 | BlockExpr |  |
-| test.rs:116:16:118:9 | BlockExpr | test.rs:114:9:118:9 | IfExpr |  |
-| test.rs:117:13:117:13 | 0 | test.rs:116:16:118:9 | BlockExpr |  |
-| test.rs:121:5:126:5 | enter test_if_let | test.rs:121:20:121:20 | a |  |
-| test.rs:121:5:126:5 | exit test_if_let (normal) | test.rs:121:5:126:5 | exit test_if_let |  |
-| test.rs:121:20:121:20 | a | test.rs:121:20:121:33 | Param | match |
-| test.rs:121:20:121:33 | Param | test.rs:122:9:124:9 | ExprStmt |  |
-| test.rs:121:43:126:5 | BlockExpr | test.rs:121:5:126:5 | exit test_if_let (normal) |  |
-| test.rs:122:9:124:9 | ExprStmt | test.rs:122:12:122:26 | LetExpr |  |
-| test.rs:122:9:124:9 | IfExpr | test.rs:125:9:125:9 | 0 |  |
-| test.rs:122:12:122:26 | LetExpr | test.rs:122:26:122:26 | a |  |
-| test.rs:122:16:122:22 | TupleStructPat | test.rs:122:9:124:9 | IfExpr | no-match |
-| test.rs:122:16:122:22 | TupleStructPat | test.rs:122:21:122:21 | n | match |
-| test.rs:122:21:122:21 | n | test.rs:123:13:123:13 | n | match |
-| test.rs:122:26:122:26 | a | test.rs:122:16:122:22 | TupleStructPat |  |
-| test.rs:122:28:124:9 | BlockExpr | test.rs:122:9:124:9 | IfExpr |  |
-| test.rs:123:13:123:13 | n | test.rs:122:28:124:9 | BlockExpr |  |
-| test.rs:125:9:125:9 | 0 | test.rs:121:43:126:5 | BlockExpr |  |
-| test.rs:128:5:134:5 | enter test_nested_if | test.rs:128:23:128:23 | a |  |
-| test.rs:128:5:134:5 | exit test_nested_if (normal) | test.rs:128:5:134:5 | exit test_nested_if |  |
-| test.rs:128:23:128:23 | a | test.rs:128:23:128:28 | Param | match |
-| test.rs:128:23:128:28 | Param | test.rs:129:16:129:16 | a |  |
-| test.rs:128:38:134:5 | BlockExpr | test.rs:128:5:134:5 | exit test_nested_if (normal) |  |
-| test.rs:129:9:133:9 | IfExpr | test.rs:128:38:134:5 | BlockExpr |  |
-| test.rs:129:13:129:48 | [boolean(false)] IfExpr | test.rs:132:13:132:13 | 0 | false |
-| test.rs:129:13:129:48 | [boolean(true)] IfExpr | test.rs:130:13:130:13 | 1 | true |
-| test.rs:129:16:129:16 | a | test.rs:129:20:129:20 | 0 |  |
-| test.rs:129:16:129:20 | ... < ... | test.rs:129:24:129:24 | a | true |
-| test.rs:129:16:129:20 | ... < ... | test.rs:129:41:129:41 | a | false |
-| test.rs:129:20:129:20 | 0 | test.rs:129:16:129:20 | ... < ... |  |
-| test.rs:129:22:129:32 | [boolean(false)] BlockExpr | test.rs:129:13:129:48 | [boolean(false)] IfExpr | false |
-| test.rs:129:22:129:32 | [boolean(true)] BlockExpr | test.rs:129:13:129:48 | [boolean(true)] IfExpr | true |
-| test.rs:129:24:129:24 | a | test.rs:129:29:129:30 | 10 |  |
-| test.rs:129:24:129:30 | ... < ... | test.rs:129:22:129:32 | [boolean(false)] BlockExpr | false |
-| test.rs:129:24:129:30 | ... < ... | test.rs:129:22:129:32 | [boolean(true)] BlockExpr | true |
-| test.rs:129:28:129:30 | - ... | test.rs:129:24:129:30 | ... < ... |  |
-| test.rs:129:29:129:30 | 10 | test.rs:129:28:129:30 | - ... |  |
-| test.rs:129:39:129:48 | [boolean(false)] BlockExpr | test.rs:129:13:129:48 | [boolean(false)] IfExpr | false |
-| test.rs:129:39:129:48 | [boolean(true)] BlockExpr | test.rs:129:13:129:48 | [boolean(true)] IfExpr | true |
-| test.rs:129:41:129:41 | a | test.rs:129:45:129:46 | 10 |  |
-| test.rs:129:41:129:46 | ... > ... | test.rs:129:39:129:48 | [boolean(false)] BlockExpr | false |
-| test.rs:129:41:129:46 | ... > ... | test.rs:129:39:129:48 | [boolean(true)] BlockExpr | true |
-| test.rs:129:45:129:46 | 10 | test.rs:129:41:129:46 | ... > ... |  |
-| test.rs:129:51:131:9 | BlockExpr | test.rs:129:9:133:9 | IfExpr |  |
-| test.rs:130:13:130:13 | 1 | test.rs:129:51:131:9 | BlockExpr |  |
-| test.rs:131:16:133:9 | BlockExpr | test.rs:129:9:133:9 | IfExpr |  |
-| test.rs:132:13:132:13 | 0 | test.rs:131:16:133:9 | BlockExpr |  |
-| test.rs:136:5:145:5 | enter test_nested_if_match | test.rs:136:29:136:29 | a |  |
-| test.rs:136:5:145:5 | exit test_nested_if_match (normal) | test.rs:136:5:145:5 | exit test_nested_if_match |  |
-| test.rs:136:29:136:29 | a | test.rs:136:29:136:34 | Param | match |
-| test.rs:136:29:136:34 | Param | test.rs:137:19:137:19 | a |  |
-| test.rs:136:44:145:5 | BlockExpr | test.rs:136:5:145:5 | exit test_nested_if_match (normal) |  |
-| test.rs:137:9:144:9 | IfExpr | test.rs:136:44:145:5 | BlockExpr |  |
-| test.rs:137:13:140:9 | [boolean(false)] MatchExpr | test.rs:143:13:143:13 | 0 | false |
-| test.rs:137:13:140:9 | [boolean(true)] MatchExpr | test.rs:141:13:141:13 | 1 | true |
-| test.rs:137:19:137:19 | a | test.rs:138:13:138:13 | LiteralPat |  |
-| test.rs:138:13:138:13 | LiteralPat | test.rs:138:18:138:21 | true | match |
-| test.rs:138:13:138:13 | LiteralPat | test.rs:139:13:139:13 | WildcardPat | no-match |
-| test.rs:138:18:138:21 | true | test.rs:137:13:140:9 | [boolean(true)] MatchExpr | true |
-| test.rs:139:13:139:13 | WildcardPat | test.rs:139:18:139:22 | false | match |
-| test.rs:139:18:139:22 | false | test.rs:137:13:140:9 | [boolean(false)] MatchExpr | false |
-| test.rs:140:12:142:9 | BlockExpr | test.rs:137:9:144:9 | IfExpr |  |
-| test.rs:141:13:141:13 | 1 | test.rs:140:12:142:9 | BlockExpr |  |
-| test.rs:142:16:144:9 | BlockExpr | test.rs:137:9:144:9 | IfExpr |  |
-| test.rs:143:13:143:13 | 0 | test.rs:142:16:144:9 | BlockExpr |  |
-| test.rs:147:5:156:5 | enter test_nested_if_block | test.rs:147:29:147:29 | a |  |
-| test.rs:147:5:156:5 | exit test_nested_if_block (normal) | test.rs:147:5:156:5 | exit test_nested_if_block |  |
-| test.rs:147:29:147:29 | a | test.rs:147:29:147:34 | Param | match |
-| test.rs:147:29:147:34 | Param | test.rs:149:13:149:15 | ExprStmt |  |
-| test.rs:147:44:156:5 | BlockExpr | test.rs:147:5:156:5 | exit test_nested_if_block (normal) |  |
-| test.rs:148:9:155:9 | IfExpr | test.rs:147:44:156:5 | BlockExpr |  |
-| test.rs:148:12:151:9 | [boolean(false)] BlockExpr | test.rs:154:13:154:13 | 0 | false |
-| test.rs:148:12:151:9 | [boolean(true)] BlockExpr | test.rs:152:13:152:13 | 1 | true |
-| test.rs:149:13:149:14 | TupleExpr | test.rs:150:13:150:13 | a |  |
-| test.rs:149:13:149:15 | ExprStmt | test.rs:149:13:149:14 | TupleExpr |  |
-| test.rs:150:13:150:13 | a | test.rs:150:17:150:17 | 0 |  |
-| test.rs:150:13:150:17 | ... > ... | test.rs:148:12:151:9 | [boolean(false)] BlockExpr | false |
-| test.rs:150:13:150:17 | ... > ... | test.rs:148:12:151:9 | [boolean(true)] BlockExpr | true |
-| test.rs:150:17:150:17 | 0 | test.rs:150:13:150:17 | ... > ... |  |
-| test.rs:151:11:153:9 | BlockExpr | test.rs:148:9:155:9 | IfExpr |  |
-| test.rs:152:13:152:13 | 1 | test.rs:151:11:153:9 | BlockExpr |  |
-| test.rs:153:16:155:9 | BlockExpr | test.rs:148:9:155:9 | IfExpr |  |
-| test.rs:154:13:154:13 | 0 | test.rs:153:16:155:9 | BlockExpr |  |
-| test.rs:158:5:165:5 | enter test_if_assignment | test.rs:158:27:158:27 | a |  |
-| test.rs:158:5:165:5 | exit test_if_assignment (normal) | test.rs:158:5:165:5 | exit test_if_assignment |  |
-| test.rs:158:27:158:27 | a | test.rs:158:27:158:32 | Param | match |
-| test.rs:158:27:158:32 | Param | test.rs:159:9:159:26 | LetStmt |  |
-| test.rs:158:42:165:5 | BlockExpr | test.rs:158:5:165:5 | exit test_if_assignment (normal) |  |
-| test.rs:159:9:159:26 | LetStmt | test.rs:159:21:159:25 | false |  |
-| test.rs:159:13:159:17 | x | test.rs:160:12:160:12 | x | match |
-| test.rs:159:21:159:25 | false | test.rs:159:13:159:17 | x |  |
-| test.rs:160:9:164:9 | IfExpr | test.rs:158:42:165:5 | BlockExpr |  |
-| test.rs:160:12:160:12 | x | test.rs:160:16:160:19 | true |  |
-| test.rs:160:12:160:19 | ... = ... | test.rs:161:13:161:13 | 1 | true |
-| test.rs:160:12:160:19 | ... = ... | test.rs:163:13:163:13 | 0 | false |
-| test.rs:160:16:160:19 | true | test.rs:160:12:160:19 | ... = ... |  |
-| test.rs:160:21:162:9 | BlockExpr | test.rs:160:9:164:9 | IfExpr |  |
-| test.rs:161:13:161:13 | 1 | test.rs:160:21:162:9 | BlockExpr |  |
-| test.rs:162:16:164:9 | BlockExpr | test.rs:160:9:164:9 | IfExpr |  |
-| test.rs:163:13:163:13 | 0 | test.rs:162:16:164:9 | BlockExpr |  |
-| test.rs:167:5:178:5 | enter test_if_loop1 | test.rs:167:22:167:22 | a |  |
-| test.rs:167:5:178:5 | exit test_if_loop1 (normal) | test.rs:167:5:178:5 | exit test_if_loop1 |  |
-| test.rs:167:22:167:22 | a | test.rs:167:22:167:27 | Param | match |
-| test.rs:167:22:167:27 | Param | test.rs:169:13:171:14 | ExprStmt |  |
-| test.rs:167:37:178:5 | BlockExpr | test.rs:167:5:178:5 | exit test_if_loop1 (normal) |  |
-| test.rs:168:9:177:9 | IfExpr | test.rs:167:37:178:5 | BlockExpr |  |
-| test.rs:168:13:173:9 | [boolean(false)] LoopExpr | test.rs:176:13:176:13 | 0 | false |
-| test.rs:168:13:173:9 | [boolean(true)] LoopExpr | test.rs:174:13:174:13 | 1 | true |
-| test.rs:168:18:173:9 | BlockExpr | test.rs:169:13:171:14 | ExprStmt |  |
-| test.rs:169:13:171:13 | IfExpr | test.rs:172:13:172:19 | ExprStmt |  |
-| test.rs:169:13:171:14 | ExprStmt | test.rs:169:16:169:16 | a |  |
-| test.rs:169:16:169:16 | a | test.rs:169:20:169:20 | 0 |  |
-| test.rs:169:16:169:20 | ... > ... | test.rs:169:13:171:13 | IfExpr | false |
-| test.rs:169:16:169:20 | ... > ... | test.rs:170:17:170:29 | ExprStmt | true |
-| test.rs:169:20:169:20 | 0 | test.rs:169:16:169:20 | ... > ... |  |
-| test.rs:170:17:170:28 | [boolean(false)] BreakExpr | test.rs:168:13:173:9 | [boolean(false)] LoopExpr | break |
-| test.rs:170:17:170:28 | [boolean(true)] BreakExpr | test.rs:168:13:173:9 | [boolean(true)] LoopExpr | break |
-| test.rs:170:17:170:29 | ExprStmt | test.rs:170:23:170:23 | a |  |
-| test.rs:170:23:170:23 | a | test.rs:170:27:170:28 | 10 |  |
-| test.rs:170:23:170:28 | ... > ... | test.rs:170:17:170:28 | [boolean(false)] BreakExpr | false |
-| test.rs:170:23:170:28 | ... > ... | test.rs:170:17:170:28 | [boolean(true)] BreakExpr | true |
-| test.rs:170:27:170:28 | 10 | test.rs:170:23:170:28 | ... > ... |  |
-| test.rs:172:13:172:13 | a | test.rs:172:17:172:18 | 10 |  |
-| test.rs:172:13:172:18 | ... < ... | test.rs:168:18:173:9 | BlockExpr |  |
-| test.rs:172:13:172:19 | ExprStmt | test.rs:172:13:172:13 | a |  |
-| test.rs:172:17:172:18 | 10 | test.rs:172:13:172:18 | ... < ... |  |
-| test.rs:173:12:175:9 | BlockExpr | test.rs:168:9:177:9 | IfExpr |  |
-| test.rs:174:13:174:13 | 1 | test.rs:173:12:175:9 | BlockExpr |  |
-| test.rs:175:16:177:9 | BlockExpr | test.rs:168:9:177:9 | IfExpr |  |
-| test.rs:176:13:176:13 | 0 | test.rs:175:16:177:9 | BlockExpr |  |
-| test.rs:180:5:191:5 | enter test_if_loop2 | test.rs:180:22:180:22 | a |  |
-| test.rs:180:5:191:5 | exit test_if_loop2 (normal) | test.rs:180:5:191:5 | exit test_if_loop2 |  |
-| test.rs:180:22:180:22 | a | test.rs:180:22:180:27 | Param | match |
-| test.rs:180:22:180:27 | Param | test.rs:182:13:184:14 | ExprStmt |  |
-| test.rs:180:37:191:5 | BlockExpr | test.rs:180:5:191:5 | exit test_if_loop2 (normal) |  |
-| test.rs:181:9:190:9 | IfExpr | test.rs:180:37:191:5 | BlockExpr |  |
-| test.rs:181:13:186:9 | [boolean(false)] LoopExpr | test.rs:189:13:189:13 | 0 | false |
-| test.rs:181:13:186:9 | [boolean(true)] LoopExpr | test.rs:187:13:187:13 | 1 | true |
-| test.rs:181:26:186:9 | BlockExpr | test.rs:182:13:184:14 | ExprStmt |  |
-| test.rs:182:13:184:13 | IfExpr | test.rs:185:13:185:19 | ExprStmt |  |
-| test.rs:182:13:184:14 | ExprStmt | test.rs:182:16:182:16 | a |  |
-| test.rs:182:16:182:16 | a | test.rs:182:20:182:20 | 0 |  |
-| test.rs:182:16:182:20 | ... > ... | test.rs:182:13:184:13 | IfExpr | false |
-| test.rs:182:16:182:20 | ... > ... | test.rs:183:17:183:36 | ExprStmt | true |
-| test.rs:182:20:182:20 | 0 | test.rs:182:16:182:20 | ... > ... |  |
-| test.rs:183:17:183:35 | [boolean(false)] BreakExpr | test.rs:181:13:186:9 | [boolean(false)] LoopExpr | break |
-| test.rs:183:17:183:35 | [boolean(true)] BreakExpr | test.rs:181:13:186:9 | [boolean(true)] LoopExpr | break |
-| test.rs:183:17:183:36 | ExprStmt | test.rs:183:30:183:30 | a |  |
-| test.rs:183:30:183:30 | a | test.rs:183:34:183:35 | 10 |  |
-| test.rs:183:30:183:35 | ... > ... | test.rs:183:17:183:35 | [boolean(false)] BreakExpr | false |
-| test.rs:183:30:183:35 | ... > ... | test.rs:183:17:183:35 | [boolean(true)] BreakExpr | true |
-| test.rs:183:34:183:35 | 10 | test.rs:183:30:183:35 | ... > ... |  |
-| test.rs:185:13:185:13 | a | test.rs:185:17:185:18 | 10 |  |
-| test.rs:185:13:185:18 | ... < ... | test.rs:181:26:186:9 | BlockExpr |  |
-| test.rs:185:13:185:19 | ExprStmt | test.rs:185:13:185:13 | a |  |
-| test.rs:185:17:185:18 | 10 | test.rs:185:13:185:18 | ... < ... |  |
-| test.rs:186:12:188:9 | BlockExpr | test.rs:181:9:190:9 | IfExpr |  |
-| test.rs:187:13:187:13 | 1 | test.rs:186:12:188:9 | BlockExpr |  |
-| test.rs:188:16:190:9 | BlockExpr | test.rs:181:9:190:9 | IfExpr |  |
-| test.rs:189:13:189:13 | 0 | test.rs:188:16:190:9 | BlockExpr |  |
-| test.rs:193:5:201:5 | enter test_labelled_block | test.rs:193:28:193:28 | a |  |
-| test.rs:193:5:201:5 | exit test_labelled_block (normal) | test.rs:193:5:201:5 | exit test_labelled_block |  |
-| test.rs:193:28:193:28 | a | test.rs:193:28:193:33 | Param | match |
-| test.rs:193:28:193:33 | Param | test.rs:195:13:195:31 | ExprStmt |  |
-| test.rs:193:43:201:5 | BlockExpr | test.rs:193:5:201:5 | exit test_labelled_block (normal) |  |
-| test.rs:194:9:200:9 | IfExpr | test.rs:193:43:201:5 | BlockExpr |  |
-| test.rs:194:13:196:9 | [boolean(false)] BlockExpr | test.rs:199:13:199:13 | 0 | false |
-| test.rs:194:13:196:9 | [boolean(true)] BlockExpr | test.rs:197:13:197:13 | 1 | true |
-| test.rs:195:13:195:30 | [boolean(false)] BreakExpr | test.rs:194:13:196:9 | [boolean(false)] BlockExpr | break |
-| test.rs:195:13:195:30 | [boolean(true)] BreakExpr | test.rs:194:13:196:9 | [boolean(true)] BlockExpr | break |
-| test.rs:195:13:195:31 | ExprStmt | test.rs:195:26:195:26 | a |  |
-| test.rs:195:26:195:26 | a | test.rs:195:30:195:30 | 0 |  |
-| test.rs:195:26:195:30 | ... > ... | test.rs:195:13:195:30 | [boolean(false)] BreakExpr | false |
-| test.rs:195:26:195:30 | ... > ... | test.rs:195:13:195:30 | [boolean(true)] BreakExpr | true |
-| test.rs:195:30:195:30 | 0 | test.rs:195:26:195:30 | ... > ... |  |
-| test.rs:196:12:198:9 | BlockExpr | test.rs:194:9:200:9 | IfExpr |  |
-| test.rs:197:13:197:13 | 1 | test.rs:196:12:198:9 | BlockExpr |  |
-| test.rs:198:16:200:9 | BlockExpr | test.rs:194:9:200:9 | IfExpr |  |
-| test.rs:199:13:199:13 | 0 | test.rs:198:16:200:9 | BlockExpr |  |
-| test.rs:206:5:209:5 | enter test_and_operator | test.rs:206:26:206:26 | a |  |
-| test.rs:206:5:209:5 | exit test_and_operator (normal) | test.rs:206:5:209:5 | exit test_and_operator |  |
-| test.rs:206:26:206:26 | a | test.rs:206:26:206:32 | Param | match |
-| test.rs:206:26:206:32 | Param | test.rs:206:35:206:35 | b |  |
-| test.rs:206:35:206:35 | b | test.rs:206:35:206:41 | Param | match |
-| test.rs:206:35:206:41 | Param | test.rs:206:44:206:44 | c |  |
-| test.rs:206:44:206:44 | c | test.rs:206:44:206:50 | Param | match |
-| test.rs:206:44:206:50 | Param | test.rs:207:9:207:28 | LetStmt |  |
-| test.rs:206:61:209:5 | BlockExpr | test.rs:206:5:209:5 | exit test_and_operator (normal) |  |
-| test.rs:207:9:207:28 | LetStmt | test.rs:207:17:207:17 | a |  |
-| test.rs:207:13:207:13 | d | test.rs:208:9:208:9 | d | match |
-| test.rs:207:17:207:17 | a | test.rs:207:17:207:22 | [boolean(false)] ... && ... | false |
-| test.rs:207:17:207:17 | a | test.rs:207:22:207:22 | b | true |
-| test.rs:207:17:207:22 | [boolean(false)] ... && ... | test.rs:207:17:207:27 | ... && ... | false |
-| test.rs:207:17:207:22 | [boolean(true)] ... && ... | test.rs:207:27:207:27 | c | true |
-| test.rs:207:17:207:27 | ... && ... | test.rs:207:13:207:13 | d |  |
-| test.rs:207:22:207:22 | b | test.rs:207:17:207:22 | [boolean(false)] ... && ... | false |
-| test.rs:207:22:207:22 | b | test.rs:207:17:207:22 | [boolean(true)] ... && ... | true |
-| test.rs:207:27:207:27 | c | test.rs:207:17:207:27 | ... && ... |  |
-| test.rs:208:9:208:9 | d | test.rs:206:61:209:5 | BlockExpr |  |
-| test.rs:211:5:214:5 | enter test_or_operator | test.rs:211:25:211:25 | a |  |
-| test.rs:211:5:214:5 | exit test_or_operator (normal) | test.rs:211:5:214:5 | exit test_or_operator |  |
-| test.rs:211:25:211:25 | a | test.rs:211:25:211:31 | Param | match |
-| test.rs:211:25:211:31 | Param | test.rs:211:34:211:34 | b |  |
-| test.rs:211:34:211:34 | b | test.rs:211:34:211:40 | Param | match |
-| test.rs:211:34:211:40 | Param | test.rs:211:43:211:43 | c |  |
-| test.rs:211:43:211:43 | c | test.rs:211:43:211:49 | Param | match |
-| test.rs:211:43:211:49 | Param | test.rs:212:9:212:28 | LetStmt |  |
-| test.rs:211:60:214:5 | BlockExpr | test.rs:211:5:214:5 | exit test_or_operator (normal) |  |
-| test.rs:212:9:212:28 | LetStmt | test.rs:212:17:212:17 | a |  |
-| test.rs:212:13:212:13 | d | test.rs:213:9:213:9 | d | match |
-| test.rs:212:17:212:17 | a | test.rs:212:17:212:22 | [boolean(true)] ... \|\| ... | true |
-| test.rs:212:17:212:17 | a | test.rs:212:22:212:22 | b | false |
-| test.rs:212:17:212:22 | [boolean(false)] ... \|\| ... | test.rs:212:27:212:27 | c | false |
-| test.rs:212:17:212:22 | [boolean(true)] ... \|\| ... | test.rs:212:17:212:27 | ... \|\| ... | true |
-| test.rs:212:17:212:27 | ... \|\| ... | test.rs:212:13:212:13 | d |  |
-| test.rs:212:22:212:22 | b | test.rs:212:17:212:22 | [boolean(false)] ... \|\| ... | false |
-| test.rs:212:22:212:22 | b | test.rs:212:17:212:22 | [boolean(true)] ... \|\| ... | true |
-| test.rs:212:27:212:27 | c | test.rs:212:17:212:27 | ... \|\| ... |  |
-| test.rs:213:9:213:9 | d | test.rs:211:60:214:5 | BlockExpr |  |
-| test.rs:216:5:219:5 | enter test_or_operator_2 | test.rs:216:27:216:27 | a |  |
-| test.rs:216:5:219:5 | exit test_or_operator_2 (normal) | test.rs:216:5:219:5 | exit test_or_operator_2 |  |
-| test.rs:216:27:216:27 | a | test.rs:216:27:216:33 | Param | match |
-| test.rs:216:27:216:33 | Param | test.rs:216:36:216:36 | b |  |
-| test.rs:216:36:216:36 | b | test.rs:216:36:216:41 | Param | match |
-| test.rs:216:36:216:41 | Param | test.rs:216:44:216:44 | c |  |
-| test.rs:216:44:216:44 | c | test.rs:216:44:216:50 | Param | match |
-| test.rs:216:44:216:50 | Param | test.rs:217:9:217:36 | LetStmt |  |
-| test.rs:216:61:219:5 | BlockExpr | test.rs:216:5:219:5 | exit test_or_operator_2 (normal) |  |
-| test.rs:217:9:217:36 | LetStmt | test.rs:217:17:217:17 | a |  |
-| test.rs:217:13:217:13 | d | test.rs:218:9:218:9 | d | match |
-| test.rs:217:17:217:17 | a | test.rs:217:17:217:30 | [boolean(true)] ... \|\| ... | true |
-| test.rs:217:17:217:17 | a | test.rs:217:23:217:23 | b | false |
-| test.rs:217:17:217:30 | [boolean(false)] ... \|\| ... | test.rs:217:35:217:35 | c | false |
-| test.rs:217:17:217:30 | [boolean(true)] ... \|\| ... | test.rs:217:17:217:35 | ... \|\| ... | true |
-| test.rs:217:17:217:35 | ... \|\| ... | test.rs:217:13:217:13 | d |  |
-| test.rs:217:23:217:23 | b | test.rs:217:28:217:29 | 28 |  |
-| test.rs:217:23:217:29 | ... == ... | test.rs:217:17:217:30 | [boolean(false)] ... \|\| ... | false |
-| test.rs:217:23:217:29 | ... == ... | test.rs:217:17:217:30 | [boolean(true)] ... \|\| ... | true |
-| test.rs:217:28:217:29 | 28 | test.rs:217:23:217:29 | ... == ... |  |
-| test.rs:217:35:217:35 | c | test.rs:217:17:217:35 | ... \|\| ... |  |
-| test.rs:218:9:218:9 | d | test.rs:216:61:219:5 | BlockExpr |  |
-| test.rs:221:5:224:5 | enter test_not_operator | test.rs:221:26:221:26 | a |  |
-| test.rs:221:5:224:5 | exit test_not_operator (normal) | test.rs:221:5:224:5 | exit test_not_operator |  |
-| test.rs:221:26:221:26 | a | test.rs:221:26:221:32 | Param | match |
-| test.rs:221:26:221:32 | Param | test.rs:222:9:222:19 | LetStmt |  |
-| test.rs:221:43:224:5 | BlockExpr | test.rs:221:5:224:5 | exit test_not_operator (normal) |  |
-| test.rs:222:9:222:19 | LetStmt | test.rs:222:18:222:18 | a |  |
-| test.rs:222:13:222:13 | d | test.rs:223:9:223:9 | d | match |
-| test.rs:222:17:222:18 | ! ... | test.rs:222:13:222:13 | d |  |
-| test.rs:222:18:222:18 | a | test.rs:222:17:222:18 | ! ... |  |
-| test.rs:223:9:223:9 | d | test.rs:221:43:224:5 | BlockExpr |  |
-| test.rs:226:5:232:5 | enter test_if_and_operator | test.rs:226:29:226:29 | a |  |
-| test.rs:226:5:232:5 | exit test_if_and_operator (normal) | test.rs:226:5:232:5 | exit test_if_and_operator |  |
-| test.rs:226:29:226:29 | a | test.rs:226:29:226:35 | Param | match |
-| test.rs:226:29:226:35 | Param | test.rs:226:38:226:38 | b |  |
-| test.rs:226:38:226:38 | b | test.rs:226:38:226:43 | Param | match |
-| test.rs:226:38:226:43 | Param | test.rs:226:46:226:46 | c |  |
-| test.rs:226:46:226:46 | c | test.rs:226:46:226:52 | Param | match |
-| test.rs:226:46:226:52 | Param | test.rs:227:12:227:12 | a |  |
-| test.rs:226:63:232:5 | BlockExpr | test.rs:226:5:232:5 | exit test_if_and_operator (normal) |  |
-| test.rs:227:9:231:9 | IfExpr | test.rs:226:63:232:5 | BlockExpr |  |
-| test.rs:227:12:227:12 | a | test.rs:227:12:227:17 | [boolean(false)] ... && ... | false |
-| test.rs:227:12:227:12 | a | test.rs:227:17:227:17 | b | true |
-| test.rs:227:12:227:17 | [boolean(false)] ... && ... | test.rs:227:12:227:22 | [boolean(false)] ... && ... | false |
-| test.rs:227:12:227:17 | [boolean(true)] ... && ... | test.rs:227:22:227:22 | c | true |
-| test.rs:227:12:227:22 | [boolean(false)] ... && ... | test.rs:230:13:230:17 | false | false |
-| test.rs:227:12:227:22 | [boolean(true)] ... && ... | test.rs:228:13:228:16 | true | true |
-| test.rs:227:17:227:17 | b | test.rs:227:12:227:17 | [boolean(false)] ... && ... | false |
-| test.rs:227:17:227:17 | b | test.rs:227:12:227:17 | [boolean(true)] ... && ... | true |
-| test.rs:227:22:227:22 | c | test.rs:227:12:227:22 | [boolean(false)] ... && ... | false |
-| test.rs:227:22:227:22 | c | test.rs:227:12:227:22 | [boolean(true)] ... && ... | true |
-| test.rs:227:24:229:9 | BlockExpr | test.rs:227:9:231:9 | IfExpr |  |
-| test.rs:228:13:228:16 | true | test.rs:227:24:229:9 | BlockExpr |  |
-| test.rs:229:16:231:9 | BlockExpr | test.rs:227:9:231:9 | IfExpr |  |
-| test.rs:230:13:230:17 | false | test.rs:229:16:231:9 | BlockExpr |  |
-| test.rs:234:5:240:5 | enter test_if_or_operator | test.rs:234:28:234:28 | a |  |
-| test.rs:234:5:240:5 | exit test_if_or_operator (normal) | test.rs:234:5:240:5 | exit test_if_or_operator |  |
-| test.rs:234:28:234:28 | a | test.rs:234:28:234:34 | Param | match |
-| test.rs:234:28:234:34 | Param | test.rs:234:37:234:37 | b |  |
-| test.rs:234:37:234:37 | b | test.rs:234:37:234:42 | Param | match |
-| test.rs:234:37:234:42 | Param | test.rs:234:45:234:45 | c |  |
-| test.rs:234:45:234:45 | c | test.rs:234:45:234:51 | Param | match |
-| test.rs:234:45:234:51 | Param | test.rs:235:12:235:12 | a |  |
-| test.rs:234:62:240:5 | BlockExpr | test.rs:234:5:240:5 | exit test_if_or_operator (normal) |  |
-| test.rs:235:9:239:9 | IfExpr | test.rs:234:62:240:5 | BlockExpr |  |
-| test.rs:235:12:235:12 | a | test.rs:235:12:235:17 | [boolean(true)] ... \|\| ... | true |
-| test.rs:235:12:235:12 | a | test.rs:235:17:235:17 | b | false |
-| test.rs:235:12:235:17 | [boolean(false)] ... \|\| ... | test.rs:235:22:235:22 | c | false |
-| test.rs:235:12:235:17 | [boolean(true)] ... \|\| ... | test.rs:235:12:235:22 | [boolean(true)] ... \|\| ... | true |
-| test.rs:235:12:235:22 | [boolean(false)] ... \|\| ... | test.rs:238:13:238:17 | false | false |
-| test.rs:235:12:235:22 | [boolean(true)] ... \|\| ... | test.rs:236:13:236:16 | true | true |
-| test.rs:235:17:235:17 | b | test.rs:235:12:235:17 | [boolean(false)] ... \|\| ... | false |
-| test.rs:235:17:235:17 | b | test.rs:235:12:235:17 | [boolean(true)] ... \|\| ... | true |
-| test.rs:235:22:235:22 | c | test.rs:235:12:235:22 | [boolean(false)] ... \|\| ... | false |
-| test.rs:235:22:235:22 | c | test.rs:235:12:235:22 | [boolean(true)] ... \|\| ... | true |
-| test.rs:235:24:237:9 | BlockExpr | test.rs:235:9:239:9 | IfExpr |  |
-| test.rs:236:13:236:16 | true | test.rs:235:24:237:9 | BlockExpr |  |
-| test.rs:237:16:239:9 | BlockExpr | test.rs:235:9:239:9 | IfExpr |  |
-| test.rs:238:13:238:17 | false | test.rs:237:16:239:9 | BlockExpr |  |
-| test.rs:242:5:248:5 | enter test_if_not_operator | test.rs:242:29:242:29 | a |  |
-| test.rs:242:5:248:5 | exit test_if_not_operator (normal) | test.rs:242:5:248:5 | exit test_if_not_operator |  |
+| test.rs:85:13:85:13 | b | test.rs:85:17:85:21 | false |  |
+| test.rs:85:13:85:21 | ... = ... | test.rs:80:17:86:9 | BlockExpr |  |
+| test.rs:85:13:85:22 | ExprStmt | test.rs:85:13:85:13 | b |  |
+| test.rs:85:17:85:21 | false | test.rs:85:13:85:21 | ... = ... |  |
+| test.rs:89:5:96:5 | enter test_while_let | test.rs:90:9:90:29 | LetStmt |  |
+| test.rs:89:5:96:5 | exit test_while_let (normal) | test.rs:89:5:96:5 | exit test_while_let |  |
+| test.rs:89:25:96:5 | BlockExpr | test.rs:89:5:96:5 | exit test_while_let (normal) |  |
+| test.rs:90:9:90:29 | LetStmt | test.rs:90:24:90:24 | 1 |  |
+| test.rs:90:13:90:20 | iter | test.rs:91:15:91:39 | LetExpr | match |
+| test.rs:90:24:90:24 | 1 | test.rs:90:27:90:28 | 10 |  |
+| test.rs:90:24:90:28 | RangeExpr | test.rs:90:13:90:20 | iter |  |
+| test.rs:90:27:90:28 | 10 | test.rs:90:24:90:28 | RangeExpr |  |
+| test.rs:91:9:95:9 | WhileExpr | test.rs:89:25:96:5 | BlockExpr |  |
+| test.rs:91:15:91:39 | LetExpr | test.rs:91:29:91:32 | iter |  |
+| test.rs:91:19:91:25 | TupleStructPat | test.rs:91:9:95:9 | WhileExpr | no-match |
+| test.rs:91:19:91:25 | TupleStructPat | test.rs:91:24:91:24 | x | match |
+| test.rs:91:24:91:24 | x | test.rs:92:17:92:17 | PathExpr | match |
+| test.rs:91:29:91:32 | iter | test.rs:91:29:91:39 | MethodCallExpr |  |
+| test.rs:91:29:91:39 | MethodCallExpr | test.rs:91:19:91:25 | TupleStructPat |  |
+| test.rs:91:41:95:9 | BlockExpr | test.rs:91:15:91:39 | LetExpr |  |
+| test.rs:92:13:94:13 | IfExpr | test.rs:91:41:95:9 | BlockExpr |  |
+| test.rs:92:17:92:17 | PathExpr | test.rs:92:21:92:21 | 5 |  |
+| test.rs:92:17:92:21 | ... = ... | test.rs:92:13:94:13 | IfExpr | false |
+| test.rs:92:17:92:21 | ... = ... | test.rs:93:17:93:22 | ExprStmt | true |
+| test.rs:92:21:92:21 | 5 | test.rs:92:17:92:21 | ... = ... |  |
+| test.rs:93:17:93:21 | BreakExpr | test.rs:91:9:95:9 | WhileExpr | break |
+| test.rs:93:17:93:22 | ExprStmt | test.rs:93:17:93:21 | BreakExpr |  |
+| test.rs:98:5:105:5 | enter test_for | test.rs:98:17:98:17 | j |  |
+| test.rs:98:5:105:5 | exit test_for (normal) | test.rs:98:5:105:5 | exit test_for |  |
+| test.rs:98:17:98:17 | j | test.rs:98:17:98:22 | Param | match |
+| test.rs:98:17:98:22 | Param | test.rs:99:18:99:18 | 0 |  |
+| test.rs:98:25:105:5 | BlockExpr | test.rs:98:5:105:5 | exit test_for (normal) |  |
+| test.rs:99:9:104:9 | ForExpr | test.rs:98:25:105:5 | BlockExpr |  |
+| test.rs:99:13:99:13 | i | test.rs:99:9:104:9 | ForExpr | no-match |
+| test.rs:99:13:99:13 | i | test.rs:100:13:102:13 | ExprStmt | match |
+| test.rs:99:18:99:18 | 0 | test.rs:99:21:99:22 | 10 |  |
+| test.rs:99:18:99:22 | RangeExpr | test.rs:99:13:99:13 | i |  |
+| test.rs:99:21:99:22 | 10 | test.rs:99:18:99:22 | RangeExpr |  |
+| test.rs:99:24:104:9 | BlockExpr | test.rs:99:13:99:13 | i |  |
+| test.rs:100:13:102:13 | ExprStmt | test.rs:100:17:100:17 | i |  |
+| test.rs:100:13:102:13 | IfExpr | test.rs:103:13:103:14 | ExprStmt |  |
+| test.rs:100:17:100:17 | i | test.rs:100:22:100:22 | j |  |
+| 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 | j | test.rs:100:17:100:22 | ... == ... |  |
+| test.rs:101:17:101:21 | BreakExpr | test.rs:99:9:104:9 | ForExpr | break |
+| test.rs:101:17:101:22 | ExprStmt | test.rs:101:17:101:21 | BreakExpr |  |
+| test.rs:103:13:103:13 | 1 | test.rs:99:24:104:9 | BlockExpr |  |
+| test.rs:103:13:103:14 | ExprStmt | test.rs:103:13:103:13 | 1 |  |
+| test.rs:107:5:111:5 | enter break_with_return | test.rs:109:13:109:27 | ExprStmt |  |
+| test.rs:107:5:111:5 | exit break_with_return (normal) | test.rs:107:5:111:5 | exit break_with_return |  |
+| test.rs:109:13:109:27 | ExprStmt | test.rs:109:26:109:26 | 1 |  |
+| test.rs:109:19:109:26 | ReturnExpr | test.rs:107:5:111:5 | exit break_with_return (normal) | return |
+| test.rs:109:26:109:26 | 1 | test.rs:109:19:109:26 | ReturnExpr |  |
+| test.rs:114:1:117:1 | enter test_nested_function | test.rs:114:25:114:25 | n |  |
+| test.rs:114:1:117:1 | exit test_nested_function (normal) | test.rs:114:1:117:1 | exit test_nested_function |  |
+| test.rs:114:25:114:25 | n | test.rs:114:25:114:30 | Param | match |
+| test.rs:114:25:114:30 | Param | test.rs:115:5:115:28 | LetStmt |  |
+| test.rs:114:40:117:1 | BlockExpr | test.rs:114:1:117:1 | exit test_nested_function (normal) |  |
+| test.rs:115:5:115:28 | LetStmt | test.rs:115:19:115:27 | ClosureExpr |  |
+| test.rs:115:9:115:15 | add_one | test.rs:116:5:116:11 | add_one | match |
+| test.rs:115:19:115:27 | ClosureExpr | test.rs:115:9:115:15 | add_one |  |
+| test.rs:115:19:115:27 | enter ClosureExpr | test.rs:115:20:115:20 | i |  |
+| test.rs:115:19:115:27 | exit ClosureExpr (normal) | test.rs:115:19:115:27 | exit ClosureExpr |  |
+| test.rs:115:20:115:20 | Param | test.rs:115:23:115:23 | i |  |
+| test.rs:115:20:115:20 | i | test.rs:115:20:115:20 | Param | match |
+| test.rs:115:23:115:23 | i | test.rs:115:27:115:27 | 1 |  |
+| test.rs:115:23:115:27 | ... + ... | test.rs:115:19:115:27 | exit ClosureExpr (normal) |  |
+| test.rs:115:27:115:27 | 1 | test.rs:115:23:115:27 | ... + ... |  |
+| test.rs:116:5:116:11 | add_one | test.rs:116:13:116:19 | add_one |  |
+| test.rs:116:5:116:23 | CallExpr | test.rs:114:40:117:1 | BlockExpr |  |
+| test.rs:116:13:116:19 | add_one | test.rs:116:21:116:21 | n |  |
+| test.rs:116:13:116:22 | CallExpr | test.rs:116:5:116:23 | CallExpr |  |
+| test.rs:116:21:116:21 | n | test.rs:116:13:116:22 | CallExpr |  |
+| test.rs:121:5:127:5 | enter test_if_else | test.rs:121:21:121:21 | n |  |
+| test.rs:121:5:127:5 | exit test_if_else (normal) | test.rs:121:5:127:5 | exit test_if_else |  |
+| test.rs:121:21:121:21 | n | test.rs:121:21:121:26 | Param | match |
+| test.rs:121:21:121:26 | Param | test.rs:122:12:122:12 | n |  |
+| test.rs:121:36:127:5 | BlockExpr | test.rs:121:5:127:5 | exit test_if_else (normal) |  |
+| test.rs:122:9:126:9 | IfExpr | test.rs:121:36:127:5 | BlockExpr |  |
+| test.rs:122:12:122:12 | n | test.rs:122:17:122:17 | 0 |  |
+| test.rs:122:12:122:17 | ... <= ... | test.rs:123:13:123:13 | 0 | true |
+| test.rs:122:12:122:17 | ... <= ... | test.rs:125:13:125:13 | n | false |
+| test.rs:122:17:122:17 | 0 | test.rs:122:12:122:17 | ... <= ... |  |
+| test.rs:122:19:124:9 | BlockExpr | test.rs:122:9:126:9 | IfExpr |  |
+| test.rs:123:13:123:13 | 0 | test.rs:122:19:124:9 | BlockExpr |  |
+| test.rs:124:16:126:9 | BlockExpr | test.rs:122:9:126:9 | IfExpr |  |
+| test.rs:125:13:125:13 | n | test.rs:125:17:125:17 | 1 |  |
+| test.rs:125:13:125:17 | ... - ... | test.rs:124:16:126:9 | BlockExpr |  |
+| test.rs:125:17:125:17 | 1 | test.rs:125:13:125:17 | ... - ... |  |
+| test.rs:129:5:135:5 | enter test_if_let_else | test.rs:129:25:129:25 | a |  |
+| test.rs:129:5:135:5 | exit test_if_let_else (normal) | test.rs:129:5:135:5 | exit test_if_let_else |  |
+| test.rs:129:25:129:25 | a | test.rs:129:25:129:38 | Param | match |
+| test.rs:129:25:129:38 | Param | test.rs:130:12:130:26 | LetExpr |  |
+| test.rs:129:48:135:5 | BlockExpr | test.rs:129:5:135:5 | exit test_if_let_else (normal) |  |
+| test.rs:130:9:134:9 | IfExpr | test.rs:129:48:135:5 | BlockExpr |  |
+| test.rs:130:12:130:26 | LetExpr | test.rs:130:26:130:26 | a |  |
+| test.rs:130:16:130:22 | TupleStructPat | test.rs:130:21:130:21 | n | match |
+| test.rs:130:16:130:22 | TupleStructPat | test.rs:133:13:133:13 | 0 | no-match |
+| test.rs:130:21:130:21 | n | test.rs:131:13:131:13 | n | match |
+| test.rs:130:26:130:26 | a | test.rs:130:16:130:22 | TupleStructPat |  |
+| test.rs:130:28:132:9 | BlockExpr | test.rs:130:9:134:9 | IfExpr |  |
+| test.rs:131:13:131:13 | n | test.rs:130:28:132:9 | BlockExpr |  |
+| test.rs:132:16:134:9 | BlockExpr | test.rs:130:9:134:9 | IfExpr |  |
+| test.rs:133:13:133:13 | 0 | test.rs:132:16:134:9 | BlockExpr |  |
+| test.rs:137:5:142:5 | enter test_if_let | test.rs:137:20:137:20 | a |  |
+| test.rs:137:5:142:5 | exit test_if_let (normal) | test.rs:137:5:142:5 | exit test_if_let |  |
+| test.rs:137:20:137:20 | a | test.rs:137:20:137:33 | Param | match |
+| test.rs:137:20:137:33 | Param | test.rs:138:9:140:9 | ExprStmt |  |
+| test.rs:137:43:142:5 | BlockExpr | test.rs:137:5:142:5 | exit test_if_let (normal) |  |
+| test.rs:138:9:140:9 | ExprStmt | test.rs:138:12:138:26 | LetExpr |  |
+| test.rs:138:9:140:9 | IfExpr | test.rs:141:9:141:9 | 0 |  |
+| test.rs:138:12:138:26 | LetExpr | test.rs:138:26:138:26 | a |  |
+| test.rs:138:16:138:22 | TupleStructPat | test.rs:138:9:140:9 | IfExpr | no-match |
+| test.rs:138:16:138:22 | TupleStructPat | test.rs:138:21:138:21 | n | 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:140:9 | IfExpr |  |
+| test.rs:139:13:139:13 | n | test.rs:138:28:140:9 | BlockExpr |  |
+| test.rs:141:9:141:9 | 0 | test.rs:137:43:142:5 | BlockExpr |  |
+| test.rs:144:5:150:5 | enter test_nested_if | test.rs:144:23:144:23 | a |  |
+| test.rs:144:5:150:5 | exit test_nested_if (normal) | test.rs:144:5:150:5 | exit test_nested_if |  |
+| test.rs:144:23:144:23 | a | test.rs:144:23:144:28 | Param | match |
+| test.rs:144:23:144:28 | Param | test.rs:145:16:145:16 | a |  |
+| test.rs:144:38:150:5 | BlockExpr | test.rs:144:5:150:5 | exit test_nested_if (normal) |  |
+| test.rs:145:9:149:9 | IfExpr | test.rs:144:38:150:5 | BlockExpr |  |
+| test.rs:145:13:145:48 | [boolean(false)] IfExpr | test.rs:148:13:148:13 | 0 | false |
+| test.rs:145:13:145:48 | [boolean(true)] IfExpr | test.rs:146:13:146:13 | 1 | true |
+| test.rs:145:16:145:16 | a | test.rs:145:20:145:20 | 0 |  |
+| test.rs:145:16:145:20 | ... < ... | test.rs:145:24:145:24 | a | true |
+| test.rs:145:16:145:20 | ... < ... | test.rs:145:41:145:41 | a | false |
+| test.rs:145:20:145:20 | 0 | test.rs:145:16:145:20 | ... < ... |  |
+| test.rs:145:22:145:32 | [boolean(false)] BlockExpr | test.rs:145:13:145:48 | [boolean(false)] IfExpr | false |
+| test.rs:145:22:145:32 | [boolean(true)] BlockExpr | test.rs:145:13:145:48 | [boolean(true)] IfExpr | true |
+| test.rs:145:24:145:24 | a | test.rs:145:29:145:30 | 10 |  |
+| test.rs:145:24:145:30 | ... < ... | test.rs:145:22:145:32 | [boolean(false)] BlockExpr | false |
+| test.rs:145:24:145:30 | ... < ... | test.rs:145:22:145:32 | [boolean(true)] BlockExpr | true |
+| test.rs:145:28:145:30 | - ... | test.rs:145:24:145:30 | ... < ... |  |
+| test.rs:145:29:145:30 | 10 | test.rs:145:28:145:30 | - ... |  |
+| test.rs:145:39:145:48 | [boolean(false)] BlockExpr | test.rs:145:13:145:48 | [boolean(false)] IfExpr | false |
+| test.rs:145:39:145:48 | [boolean(true)] BlockExpr | test.rs:145:13:145:48 | [boolean(true)] IfExpr | true |
+| test.rs:145:41:145:41 | a | test.rs:145:45:145:46 | 10 |  |
+| test.rs:145:41:145:46 | ... > ... | test.rs:145:39:145:48 | [boolean(false)] BlockExpr | false |
+| test.rs:145:41:145:46 | ... > ... | test.rs:145:39:145:48 | [boolean(true)] BlockExpr | true |
+| test.rs:145:45:145:46 | 10 | test.rs:145:41:145:46 | ... > ... |  |
+| test.rs:145:51:147:9 | BlockExpr | test.rs:145:9:149:9 | IfExpr |  |
+| test.rs:146:13:146:13 | 1 | test.rs:145:51:147:9 | BlockExpr |  |
+| test.rs:147:16:149:9 | BlockExpr | test.rs:145:9:149:9 | IfExpr |  |
+| test.rs:148:13:148:13 | 0 | test.rs:147:16:149:9 | BlockExpr |  |
+| test.rs:152:5:161:5 | enter test_nested_if_match | test.rs:152:29:152:29 | a |  |
+| test.rs:152:5:161:5 | exit test_nested_if_match (normal) | test.rs:152:5:161:5 | exit test_nested_if_match |  |
+| test.rs:152:29:152:29 | a | test.rs:152:29:152:34 | Param | match |
+| test.rs:152:29:152:34 | Param | test.rs:153:19:153:19 | a |  |
+| test.rs:152:44:161:5 | BlockExpr | test.rs:152:5:161:5 | exit test_nested_if_match (normal) |  |
+| test.rs:153:9:160:9 | IfExpr | test.rs:152:44:161:5 | BlockExpr |  |
+| test.rs:153:13:156:9 | [boolean(false)] MatchExpr | test.rs:159:13:159:13 | 0 | false |
+| test.rs:153:13:156:9 | [boolean(true)] MatchExpr | test.rs:157:13:157:13 | 1 | true |
+| test.rs:153:19:153:19 | a | test.rs:154:13:154:13 | LiteralPat |  |
+| test.rs:154:13:154:13 | LiteralPat | test.rs:154:18:154:21 | true | match |
+| test.rs:154:13:154:13 | LiteralPat | test.rs:155:13:155:13 | WildcardPat | no-match |
+| test.rs:154:18:154:21 | true | test.rs:153:13:156:9 | [boolean(true)] MatchExpr | true |
+| test.rs:155:13:155:13 | WildcardPat | test.rs:155:18:155:22 | false | match |
+| test.rs:155:18:155:22 | false | test.rs:153:13:156:9 | [boolean(false)] MatchExpr | false |
+| test.rs:156:12:158:9 | BlockExpr | test.rs:153:9:160:9 | IfExpr |  |
+| test.rs:157:13:157:13 | 1 | test.rs:156:12:158:9 | BlockExpr |  |
+| test.rs:158:16:160:9 | BlockExpr | test.rs:153:9:160:9 | IfExpr |  |
+| test.rs:159:13:159:13 | 0 | test.rs:158:16:160:9 | BlockExpr |  |
+| test.rs:163:5:172:5 | enter test_nested_if_block | test.rs:163:29:163:29 | a |  |
+| test.rs:163:5:172:5 | exit test_nested_if_block (normal) | test.rs:163:5:172:5 | exit test_nested_if_block |  |
+| test.rs:163:29:163:29 | a | test.rs:163:29:163:34 | Param | match |
+| test.rs:163:29:163:34 | Param | test.rs:165:13:165:15 | ExprStmt |  |
+| test.rs:163:44:172:5 | BlockExpr | test.rs:163:5:172:5 | exit test_nested_if_block (normal) |  |
+| test.rs:164:9:171:9 | IfExpr | test.rs:163:44:172:5 | BlockExpr |  |
+| test.rs:164:12:167:9 | [boolean(false)] BlockExpr | test.rs:170:13:170:13 | 0 | false |
+| test.rs:164:12:167:9 | [boolean(true)] BlockExpr | test.rs:168:13:168:13 | 1 | true |
+| test.rs:165:13:165:14 | TupleExpr | test.rs:166:13:166:13 | a |  |
+| test.rs:165:13:165:15 | ExprStmt | test.rs:165:13:165:14 | TupleExpr |  |
+| test.rs:166:13:166:13 | a | test.rs:166:17:166:17 | 0 |  |
+| test.rs:166:13:166:17 | ... > ... | test.rs:164:12:167:9 | [boolean(false)] BlockExpr | false |
+| test.rs:166:13:166:17 | ... > ... | test.rs:164:12:167:9 | [boolean(true)] BlockExpr | true |
+| test.rs:166:17:166:17 | 0 | test.rs:166:13:166:17 | ... > ... |  |
+| test.rs:167:11:169:9 | BlockExpr | test.rs:164:9:171:9 | IfExpr |  |
+| test.rs:168:13:168:13 | 1 | test.rs:167:11:169:9 | BlockExpr |  |
+| test.rs:169:16:171:9 | BlockExpr | test.rs:164:9:171:9 | IfExpr |  |
+| test.rs:170:13:170:13 | 0 | test.rs:169:16:171:9 | BlockExpr |  |
+| test.rs:174:5:181:5 | enter test_if_assignment | test.rs:174:27:174:27 | a |  |
+| test.rs:174:5:181:5 | exit test_if_assignment (normal) | test.rs:174:5:181:5 | exit test_if_assignment |  |
+| test.rs:174:27:174:27 | a | test.rs:174:27:174:32 | Param | match |
+| test.rs:174:27:174:32 | Param | test.rs:175:9:175:26 | LetStmt |  |
+| test.rs:174:42:181:5 | BlockExpr | test.rs:174:5:181:5 | exit test_if_assignment (normal) |  |
+| test.rs:175:9:175:26 | LetStmt | test.rs:175:21:175:25 | false |  |
+| test.rs:175:13:175:17 | x | test.rs:176:12:176:12 | x | match |
+| test.rs:175:21:175:25 | false | test.rs:175:13:175:17 | x |  |
+| test.rs:176:9:180:9 | IfExpr | test.rs:174:42:181:5 | BlockExpr |  |
+| test.rs:176:12:176:12 | x | test.rs:176:16:176:19 | true |  |
+| test.rs:176:12:176:19 | ... = ... | test.rs:177:13:177:13 | 1 | true |
+| test.rs:176:12:176:19 | ... = ... | test.rs:179:13:179:13 | 0 | false |
+| test.rs:176:16:176:19 | true | test.rs:176:12:176:19 | ... = ... |  |
+| test.rs:176:21:178:9 | BlockExpr | test.rs:176:9:180:9 | IfExpr |  |
+| test.rs:177:13:177:13 | 1 | test.rs:176:21:178:9 | BlockExpr |  |
+| test.rs:178:16:180:9 | BlockExpr | test.rs:176:9:180:9 | IfExpr |  |
+| test.rs:179:13:179:13 | 0 | test.rs:178:16:180:9 | BlockExpr |  |
+| test.rs:183:5:194:5 | enter test_if_loop1 | test.rs:183:22:183:22 | a |  |
+| test.rs:183:5:194:5 | exit test_if_loop1 (normal) | test.rs:183:5:194:5 | exit test_if_loop1 |  |
+| test.rs:183:22:183:22 | a | test.rs:183:22:183:27 | Param | match |
+| test.rs:183:22:183:27 | Param | test.rs:185:13:187:14 | ExprStmt |  |
+| test.rs:183:37:194:5 | BlockExpr | test.rs:183:5:194:5 | exit test_if_loop1 (normal) |  |
+| test.rs:184:9:193:9 | IfExpr | test.rs:183:37:194:5 | BlockExpr |  |
+| test.rs:184:13:189:9 | [boolean(false)] LoopExpr | test.rs:192:13:192:13 | 0 | false |
+| test.rs:184:13:189:9 | [boolean(true)] LoopExpr | test.rs:190:13:190:13 | 1 | true |
+| test.rs:184:18:189:9 | BlockExpr | test.rs:185:13:187:14 | ExprStmt |  |
+| test.rs:185:13:187:13 | IfExpr | test.rs:188:13:188:19 | ExprStmt |  |
+| test.rs:185:13:187:14 | ExprStmt | test.rs:185:16:185:16 | a |  |
+| test.rs:185:16:185:16 | a | test.rs:185:20:185:20 | 0 |  |
+| test.rs:185:16:185:20 | ... > ... | test.rs:185:13:187:13 | IfExpr | false |
+| test.rs:185:16:185:20 | ... > ... | test.rs:186:17:186:29 | ExprStmt | true |
+| test.rs:185:20:185:20 | 0 | test.rs:185:16:185:20 | ... > ... |  |
+| test.rs:186:17:186:28 | [boolean(false)] BreakExpr | test.rs:184:13:189:9 | [boolean(false)] LoopExpr | break |
+| test.rs:186:17:186:28 | [boolean(true)] BreakExpr | test.rs:184:13:189:9 | [boolean(true)] LoopExpr | break |
+| test.rs:186:17:186:29 | ExprStmt | test.rs:186:23:186:23 | a |  |
+| test.rs:186:23:186:23 | a | test.rs:186:27:186:28 | 10 |  |
+| test.rs:186:23:186:28 | ... > ... | test.rs:186:17:186:28 | [boolean(false)] BreakExpr | false |
+| test.rs:186:23:186:28 | ... > ... | test.rs:186:17:186:28 | [boolean(true)] BreakExpr | true |
+| test.rs:186:27:186:28 | 10 | test.rs:186:23:186:28 | ... > ... |  |
+| test.rs:188:13:188:13 | a | test.rs:188:17:188:18 | 10 |  |
+| test.rs:188:13:188:18 | ... < ... | test.rs:184:18:189:9 | BlockExpr |  |
+| test.rs:188:13:188:19 | ExprStmt | test.rs:188:13:188:13 | a |  |
+| test.rs:188:17:188:18 | 10 | test.rs:188:13:188:18 | ... < ... |  |
+| test.rs:189:12:191:9 | BlockExpr | test.rs:184:9:193:9 | IfExpr |  |
+| test.rs:190:13:190:13 | 1 | test.rs:189:12:191:9 | BlockExpr |  |
+| test.rs:191:16:193:9 | BlockExpr | test.rs:184:9:193:9 | IfExpr |  |
+| test.rs:192:13:192:13 | 0 | test.rs:191:16:193:9 | BlockExpr |  |
+| test.rs:196:5:207:5 | enter test_if_loop2 | test.rs:196:22:196:22 | a |  |
+| test.rs:196:5:207:5 | exit test_if_loop2 (normal) | test.rs:196:5:207:5 | exit test_if_loop2 |  |
+| test.rs:196:22:196:22 | a | test.rs:196:22:196:27 | Param | match |
+| test.rs:196:22:196:27 | Param | test.rs:198:13:200:14 | ExprStmt |  |
+| test.rs:196:37:207:5 | BlockExpr | test.rs:196:5:207:5 | exit test_if_loop2 (normal) |  |
+| test.rs:197:9:206:9 | IfExpr | test.rs:196:37:207:5 | BlockExpr |  |
+| test.rs:197:13:202:9 | [boolean(false)] LoopExpr | test.rs:205:13:205:13 | 0 | false |
+| test.rs:197:13:202:9 | [boolean(true)] LoopExpr | test.rs:203:13:203:13 | 1 | true |
+| test.rs:197:26:202:9 | BlockExpr | test.rs:198:13:200:14 | ExprStmt |  |
+| test.rs:198:13:200:13 | IfExpr | test.rs:201:13:201:19 | ExprStmt |  |
+| test.rs:198:13:200:14 | ExprStmt | test.rs:198:16:198:16 | a |  |
+| test.rs:198:16:198:16 | a | test.rs:198:20:198:20 | 0 |  |
+| test.rs:198:16:198:20 | ... > ... | test.rs:198:13:200:13 | IfExpr | false |
+| test.rs:198:16:198:20 | ... > ... | test.rs:199:17:199:36 | ExprStmt | true |
+| test.rs:198:20:198:20 | 0 | test.rs:198:16:198:20 | ... > ... |  |
+| test.rs:199:17:199:35 | [boolean(false)] BreakExpr | test.rs:197:13:202:9 | [boolean(false)] LoopExpr | break |
+| test.rs:199:17:199:35 | [boolean(true)] BreakExpr | test.rs:197:13:202:9 | [boolean(true)] LoopExpr | break |
+| test.rs:199:17:199:36 | ExprStmt | test.rs:199:30:199:30 | a |  |
+| test.rs:199:30:199:30 | a | test.rs:199:34:199:35 | 10 |  |
+| test.rs:199:30:199:35 | ... > ... | test.rs:199:17:199:35 | [boolean(false)] BreakExpr | false |
+| test.rs:199:30:199:35 | ... > ... | test.rs:199:17:199:35 | [boolean(true)] BreakExpr | true |
+| test.rs:199:34:199:35 | 10 | test.rs:199:30:199:35 | ... > ... |  |
+| test.rs:201:13:201:13 | a | test.rs:201:17:201:18 | 10 |  |
+| test.rs:201:13:201:18 | ... < ... | test.rs:197:26:202:9 | BlockExpr |  |
+| test.rs:201:13:201:19 | ExprStmt | test.rs:201:13:201:13 | a |  |
+| test.rs:201:17:201:18 | 10 | test.rs:201:13:201:18 | ... < ... |  |
+| test.rs:202:12:204:9 | BlockExpr | test.rs:197:9:206:9 | IfExpr |  |
+| test.rs:203:13:203:13 | 1 | test.rs:202:12:204:9 | BlockExpr |  |
+| test.rs:204:16:206:9 | BlockExpr | test.rs:197:9:206:9 | IfExpr |  |
+| test.rs:205:13:205:13 | 0 | test.rs:204:16:206:9 | BlockExpr |  |
+| test.rs:209:5:217:5 | enter test_labelled_block | test.rs:209:28:209:28 | a |  |
+| test.rs:209:5:217:5 | exit test_labelled_block (normal) | test.rs:209:5:217:5 | exit test_labelled_block |  |
+| test.rs:209:28:209:28 | a | test.rs:209:28:209:33 | Param | match |
+| test.rs:209:28:209:33 | Param | test.rs:211:13:211:31 | ExprStmt |  |
+| test.rs:209:43:217:5 | BlockExpr | test.rs:209:5:217:5 | exit test_labelled_block (normal) |  |
+| test.rs:210:9:216:9 | IfExpr | test.rs:209:43:217:5 | BlockExpr |  |
+| test.rs:210:13:212:9 | [boolean(false)] BlockExpr | test.rs:215:13:215:13 | 0 | false |
+| test.rs:210:13:212:9 | [boolean(true)] BlockExpr | test.rs:213:13:213:13 | 1 | true |
+| test.rs:211:13:211:30 | [boolean(false)] BreakExpr | test.rs:210:13:212:9 | [boolean(false)] BlockExpr | break |
+| test.rs:211:13:211:30 | [boolean(true)] BreakExpr | test.rs:210:13:212:9 | [boolean(true)] BlockExpr | break |
+| test.rs:211:13:211:31 | ExprStmt | test.rs:211:26:211:26 | a |  |
+| test.rs:211:26:211:26 | a | test.rs:211:30:211:30 | 0 |  |
+| test.rs:211:26:211:30 | ... > ... | test.rs:211:13:211:30 | [boolean(false)] BreakExpr | false |
+| test.rs:211:26:211:30 | ... > ... | test.rs:211:13:211:30 | [boolean(true)] BreakExpr | true |
+| test.rs:211:30:211:30 | 0 | test.rs:211:26:211:30 | ... > ... |  |
+| test.rs:212:12:214:9 | BlockExpr | test.rs:210:9:216:9 | IfExpr |  |
+| test.rs:213:13:213:13 | 1 | test.rs:212:12:214:9 | BlockExpr |  |
+| test.rs:214:16:216:9 | BlockExpr | test.rs:210:9:216:9 | IfExpr |  |
+| test.rs:215:13:215:13 | 0 | test.rs:214:16:216:9 | BlockExpr |  |
+| test.rs:222:5:225:5 | enter test_and_operator | test.rs:222:26:222:26 | a |  |
+| test.rs:222:5:225:5 | exit test_and_operator (normal) | test.rs:222:5:225:5 | exit test_and_operator |  |
+| test.rs:222:26:222:26 | a | test.rs:222:26:222:32 | Param | match |
+| test.rs:222:26:222:32 | Param | test.rs:222:35:222:35 | b |  |
+| test.rs:222:35:222:35 | b | test.rs:222:35:222:41 | Param | match |
+| test.rs:222:35:222:41 | Param | test.rs:222:44:222:44 | c |  |
+| test.rs:222:44:222:44 | c | test.rs:222:44:222:50 | Param | match |
+| test.rs:222:44:222:50 | Param | test.rs:223:9:223:28 | LetStmt |  |
+| test.rs:222:61:225:5 | BlockExpr | test.rs:222:5:225:5 | exit test_and_operator (normal) |  |
+| test.rs:223:9:223:28 | LetStmt | test.rs:223:17:223:17 | a |  |
+| test.rs:223:13:223:13 | d | test.rs:224:9:224:9 | d | match |
+| test.rs:223:17:223:17 | a | test.rs:223:17:223:22 | [boolean(false)] ... && ... | false |
+| test.rs:223:17:223:17 | a | test.rs:223:22:223:22 | b | true |
+| test.rs:223:17:223:22 | [boolean(false)] ... && ... | test.rs:223:17:223:27 | ... && ... | false |
+| test.rs:223:17:223:22 | [boolean(true)] ... && ... | test.rs:223:27:223:27 | c | true |
+| test.rs:223:17:223:27 | ... && ... | test.rs:223:13:223:13 | d |  |
+| test.rs:223:22:223:22 | b | test.rs:223:17:223:22 | [boolean(false)] ... && ... | false |
+| test.rs:223:22:223:22 | b | test.rs:223:17:223:22 | [boolean(true)] ... && ... | true |
+| test.rs:223:27:223:27 | c | test.rs:223:17:223:27 | ... && ... |  |
+| test.rs:224:9:224:9 | d | test.rs:222:61:225:5 | BlockExpr |  |
+| test.rs:227:5:230:5 | enter test_or_operator | test.rs:227:25:227:25 | a |  |
+| test.rs:227:5:230:5 | exit test_or_operator (normal) | test.rs:227:5:230:5 | exit test_or_operator |  |
+| test.rs:227:25:227:25 | a | test.rs:227:25:227:31 | Param | match |
+| test.rs:227:25:227:31 | Param | test.rs:227:34:227:34 | b |  |
+| test.rs:227:34:227:34 | b | test.rs:227:34:227:40 | Param | match |
+| test.rs:227:34:227:40 | Param | test.rs:227:43:227:43 | c |  |
+| test.rs:227:43:227:43 | c | test.rs:227:43:227:49 | Param | match |
+| test.rs:227:43:227:49 | Param | test.rs:228:9:228:28 | LetStmt |  |
+| test.rs:227:60:230:5 | BlockExpr | test.rs:227:5:230:5 | exit test_or_operator (normal) |  |
+| test.rs:228:9:228:28 | LetStmt | test.rs:228:17:228:17 | a |  |
+| test.rs:228:13:228:13 | d | test.rs:229:9:229:9 | d | match |
+| test.rs:228:17:228:17 | a | test.rs:228:17:228:22 | [boolean(true)] ... \|\| ... | true |
+| test.rs:228:17:228:17 | a | test.rs:228:22:228:22 | b | false |
+| test.rs:228:17:228:22 | [boolean(false)] ... \|\| ... | test.rs:228:27:228:27 | c | false |
+| test.rs:228:17:228:22 | [boolean(true)] ... \|\| ... | test.rs:228:17:228:27 | ... \|\| ... | true |
+| test.rs:228:17:228:27 | ... \|\| ... | test.rs:228:13:228:13 | d |  |
+| test.rs:228:22:228:22 | b | test.rs:228:17:228:22 | [boolean(false)] ... \|\| ... | false |
+| test.rs:228:22:228:22 | b | test.rs:228:17:228:22 | [boolean(true)] ... \|\| ... | true |
+| test.rs:228:27:228:27 | c | test.rs:228:17:228:27 | ... \|\| ... |  |
+| test.rs:229:9:229:9 | d | test.rs:227:60:230:5 | BlockExpr |  |
+| test.rs:232:5:235:5 | enter test_or_operator_2 | test.rs:232:27:232:27 | a |  |
+| test.rs:232:5:235:5 | exit test_or_operator_2 (normal) | test.rs:232:5:235:5 | exit test_or_operator_2 |  |
+| test.rs:232:27:232:27 | a | test.rs:232:27:232:33 | Param | match |
+| test.rs:232:27:232:33 | Param | test.rs:232:36:232:36 | b |  |
+| test.rs:232:36:232:36 | b | test.rs:232:36:232:41 | Param | match |
+| test.rs:232:36:232:41 | Param | test.rs:232:44:232:44 | c |  |
+| test.rs:232:44:232:44 | c | test.rs:232:44:232:50 | Param | match |
+| test.rs:232:44:232:50 | Param | test.rs:233:9:233:36 | LetStmt |  |
+| test.rs:232:61:235:5 | BlockExpr | test.rs:232:5:235:5 | exit test_or_operator_2 (normal) |  |
+| test.rs:233:9:233:36 | LetStmt | test.rs:233:17:233:17 | a |  |
+| test.rs:233:13:233:13 | d | test.rs:234:9:234:9 | d | match |
+| test.rs:233:17:233:17 | a | test.rs:233:17:233:30 | [boolean(true)] ... \|\| ... | true |
+| test.rs:233:17:233:17 | a | test.rs:233:23:233:23 | b | false |
+| test.rs:233:17:233:30 | [boolean(false)] ... \|\| ... | test.rs:233:35:233:35 | c | false |
+| test.rs:233:17:233:30 | [boolean(true)] ... \|\| ... | test.rs:233:17:233:35 | ... \|\| ... | true |
+| test.rs:233:17:233:35 | ... \|\| ... | test.rs:233:13:233:13 | d |  |
+| test.rs:233:23:233:23 | b | test.rs:233:28:233:29 | 28 |  |
+| test.rs:233:23:233:29 | ... == ... | test.rs:233:17:233:30 | [boolean(false)] ... \|\| ... | false |
+| test.rs:233:23:233:29 | ... == ... | test.rs:233:17:233:30 | [boolean(true)] ... \|\| ... | true |
+| test.rs:233:28:233:29 | 28 | test.rs:233:23:233:29 | ... == ... |  |
+| test.rs:233:35:233:35 | c | test.rs:233:17:233:35 | ... \|\| ... |  |
+| test.rs:234:9:234:9 | d | test.rs:232:61:235:5 | BlockExpr |  |
+| test.rs:237:5:240:5 | enter test_not_operator | test.rs:237:26:237:26 | a |  |
+| test.rs:237:5:240:5 | exit test_not_operator (normal) | test.rs:237:5:240:5 | exit test_not_operator |  |
+| test.rs:237:26:237:26 | a | test.rs:237:26:237:32 | Param | match |
+| test.rs:237:26:237:32 | Param | test.rs:238:9:238:19 | LetStmt |  |
+| test.rs:237:43:240:5 | BlockExpr | test.rs:237:5:240:5 | exit test_not_operator (normal) |  |
+| test.rs:238:9:238:19 | LetStmt | test.rs:238:18:238:18 | a |  |
+| test.rs:238:13:238:13 | d | test.rs:239:9:239:9 | d | match |
+| test.rs:238:17:238:18 | ! ... | test.rs:238:13:238:13 | d |  |
+| test.rs:238:18:238:18 | a | test.rs:238:17:238:18 | ! ... |  |
+| test.rs:239:9:239:9 | d | test.rs:237:43:240:5 | BlockExpr |  |
+| test.rs:242:5:248:5 | enter test_if_and_operator | test.rs:242:29:242:29 | a |  |
+| test.rs:242:5:248:5 | exit test_if_and_operator (normal) | test.rs:242:5:248:5 | exit test_if_and_operator |  |
 | test.rs:242:29:242:29 | a | test.rs:242:29:242:35 | Param | match |
-| test.rs:242:29:242:35 | Param | test.rs:243:13:243:13 | a |  |
-| test.rs:242:46:248:5 | BlockExpr | test.rs:242:5:248:5 | exit test_if_not_operator (normal) |  |
-| test.rs:243:9:247:9 | IfExpr | test.rs:242:46:248:5 | BlockExpr |  |
-| test.rs:243:12:243:13 | [boolean(false)] ! ... | test.rs:246:13:246:17 | false | false |
-| test.rs:243:12:243:13 | [boolean(true)] ! ... | test.rs:244:13:244:16 | true | true |
-| test.rs:243:13:243:13 | a | test.rs:243:12:243:13 | [boolean(false)] ! ... | true |
-| test.rs:243:13:243:13 | a | test.rs:243:12:243:13 | [boolean(true)] ! ... | false |
-| test.rs:243:15:245:9 | BlockExpr | test.rs:243:9:247:9 | IfExpr |  |
-| test.rs:244:13:244:16 | true | test.rs:243:15:245:9 | BlockExpr |  |
+| test.rs:242:29:242:35 | Param | test.rs:242:38:242:38 | b |  |
+| test.rs:242:38:242:38 | b | test.rs:242:38:242:43 | Param | match |
+| test.rs:242:38:242:43 | Param | test.rs:242:46:242:46 | c |  |
+| test.rs:242:46:242:46 | c | test.rs:242:46:242:52 | Param | match |
+| test.rs:242:46:242:52 | Param | test.rs:243:12:243:12 | a |  |
+| test.rs:242:63:248:5 | BlockExpr | test.rs:242:5:248:5 | exit test_if_and_operator (normal) |  |
+| test.rs:243:9:247:9 | IfExpr | test.rs:242:63:248:5 | BlockExpr |  |
+| test.rs:243:12:243:12 | a | test.rs:243:12:243:17 | [boolean(false)] ... && ... | false |
+| test.rs:243:12:243:12 | a | test.rs:243:17:243:17 | b | true |
+| test.rs:243:12:243:17 | [boolean(false)] ... && ... | test.rs:243:12:243:22 | [boolean(false)] ... && ... | false |
+| test.rs:243:12:243:17 | [boolean(true)] ... && ... | test.rs:243:22:243:22 | c | true |
+| test.rs:243:12:243:22 | [boolean(false)] ... && ... | test.rs:246:13:246:17 | false | false |
+| test.rs:243:12:243:22 | [boolean(true)] ... && ... | test.rs:244:13:244:16 | true | true |
+| test.rs:243:17:243:17 | b | test.rs:243:12:243:17 | [boolean(false)] ... && ... | false |
+| test.rs:243:17:243:17 | b | test.rs:243:12:243:17 | [boolean(true)] ... && ... | true |
+| test.rs:243:22:243:22 | c | test.rs:243:12:243:22 | [boolean(false)] ... && ... | false |
+| test.rs:243:22:243:22 | c | test.rs:243:12:243:22 | [boolean(true)] ... && ... | true |
+| test.rs:243:24:245:9 | BlockExpr | test.rs:243:9:247:9 | IfExpr |  |
+| test.rs:244:13:244:16 | true | test.rs:243:24:245:9 | BlockExpr |  |
 | test.rs:245:16:247:9 | BlockExpr | test.rs:243:9:247:9 | IfExpr |  |
 | test.rs:246:13:246:17 | false | test.rs:245:16:247:9 | BlockExpr |  |
-| test.rs:253:5:255:5 | enter test_question_mark_operator_1 | test.rs:253:38:253:38 | s |  |
-| test.rs:253:5:255:5 | exit test_question_mark_operator_1 (normal) | test.rs:253:5:255:5 | exit test_question_mark_operator_1 |  |
-| test.rs:253:38:253:38 | s | test.rs:253:38:253:44 | Param | match |
-| test.rs:253:38:253:44 | Param | test.rs:254:9:254:11 | PathExpr |  |
-| test.rs:253:62:255:5 | BlockExpr | test.rs:253:5:255:5 | exit test_question_mark_operator_1 (normal) |  |
-| test.rs:254:9:254:11 | PathExpr | test.rs:254:9:254:26 | MethodCallExpr |  |
-| test.rs:254:9:254:26 | MethodCallExpr | test.rs:254:9:254:27 | TryExpr |  |
-| test.rs:254:9:254:27 | TryExpr | test.rs:253:5:255:5 | exit test_question_mark_operator_1 (normal) | return |
-| test.rs:254:9:254:27 | TryExpr | test.rs:254:31:254:31 | 4 |  |
-| test.rs:254:9:254:31 | ... + ... | test.rs:253:62:255:5 | BlockExpr |  |
-| test.rs:254:31:254:31 | 4 | test.rs:254:9:254:31 | ... + ... |  |
-| test.rs:257:5:262:5 | enter test_question_mark_operator_2 | test.rs:257:38:257:38 | b |  |
-| test.rs:257:5:262:5 | exit test_question_mark_operator_2 (normal) | test.rs:257:5:262:5 | exit test_question_mark_operator_2 |  |
-| test.rs:257:38:257:38 | b | test.rs:257:38:257:52 | Param | match |
-| test.rs:257:38:257:52 | Param | test.rs:258:15:258:15 | b |  |
-| test.rs:257:71:262:5 | BlockExpr | test.rs:257:5:262:5 | exit test_question_mark_operator_2 (normal) |  |
-| test.rs:258:9:261:9 | MatchExpr | test.rs:257:71:262:5 | BlockExpr |  |
-| test.rs:258:15:258:15 | b | test.rs:258:15:258:16 | TryExpr |  |
-| test.rs:258:15:258:16 | TryExpr | test.rs:257:5:262:5 | exit test_question_mark_operator_2 (normal) | return |
-| test.rs:258:15:258:16 | TryExpr | test.rs:259:13:259:16 | LiteralPat |  |
-| test.rs:259:13:259:16 | LiteralPat | test.rs:259:21:259:24 | PathExpr | match |
-| test.rs:259:13:259:16 | LiteralPat | test.rs:260:13:260:17 | LiteralPat | no-match |
-| test.rs:259:21:259:24 | PathExpr | test.rs:259:26:259:30 | false |  |
-| test.rs:259:21:259:31 | CallExpr | test.rs:258:9:261:9 | MatchExpr |  |
-| test.rs:259:26:259:30 | false | test.rs:259:21:259:31 | CallExpr |  |
-| test.rs:260:13:260:17 | LiteralPat | test.rs:260:22:260:25 | PathExpr | match |
-| test.rs:260:22:260:25 | PathExpr | test.rs:260:27:260:30 | true |  |
-| test.rs:260:22:260:31 | CallExpr | test.rs:258:9:261:9 | MatchExpr |  |
-| test.rs:260:27:260:30 | true | test.rs:260:22:260:31 | CallExpr |  |
-| test.rs:267:5:273:5 | enter test_match | test.rs:267:19:267:29 | maybe_digit |  |
-| test.rs:267:5:273:5 | exit test_match (normal) | test.rs:267:5:273:5 | exit test_match |  |
-| test.rs:267:19:267:29 | maybe_digit | test.rs:267:19:267:42 | Param | match |
-| test.rs:267:19:267:42 | Param | test.rs:268:15:268:25 | maybe_digit |  |
-| test.rs:267:52:273:5 | BlockExpr | test.rs:267:5:273:5 | exit test_match (normal) |  |
-| test.rs:268:9:272:9 | MatchExpr | test.rs:267:52:273:5 | BlockExpr |  |
-| test.rs:268:15:268:25 | maybe_digit | test.rs:269:13:269:27 | TupleStructPat |  |
-| test.rs:269:13:269:27 | TupleStructPat | test.rs:269:26:269:26 | x | match |
-| test.rs:269:13:269:27 | TupleStructPat | test.rs:270:13:270:27 | TupleStructPat | no-match |
-| test.rs:269:26:269:26 | x | test.rs:269:32:269:32 | x | match |
-| test.rs:269:32:269:32 | x | test.rs:269:36:269:37 | 10 |  |
-| test.rs:269:32:269:37 | ... < ... | test.rs:269:42:269:42 | x | true |
-| test.rs:269:32:269:37 | ... < ... | test.rs:270:13:270:27 | TupleStructPat | false |
-| test.rs:269:36:269:37 | 10 | test.rs:269:32:269:37 | ... < ... |  |
-| test.rs:269:42:269:42 | x | test.rs:269:46:269:46 | 5 |  |
-| test.rs:269:42:269:46 | ... + ... | test.rs:268:9:272:9 | MatchExpr |  |
-| test.rs:269:46:269:46 | 5 | test.rs:269:42:269:46 | ... + ... |  |
-| test.rs:270:13:270:27 | TupleStructPat | test.rs:270:26:270:26 | x | match |
-| test.rs:270:13:270:27 | TupleStructPat | test.rs:271:13:271:24 | PathPat | no-match |
-| test.rs:270:26:270:26 | x | test.rs:270:32:270:32 | x | match |
-| test.rs:270:32:270:32 | x | test.rs:268:9:272:9 | MatchExpr |  |
-| test.rs:271:13:271:24 | PathPat | test.rs:271:29:271:29 | 5 | match |
-| test.rs:271:29:271:29 | 5 | test.rs:268:9:272:9 | MatchExpr |  |
-| test.rs:275:5:284:5 | enter test_match_with_return_in_scrutinee | test.rs:275:44:275:54 | maybe_digit |  |
-| test.rs:275:5:284:5 | exit test_match_with_return_in_scrutinee (normal) | test.rs:275:5:284:5 | exit test_match_with_return_in_scrutinee |  |
-| test.rs:275:44:275:54 | maybe_digit | test.rs:275:44:275:67 | Param | match |
-| test.rs:275:44:275:67 | Param | test.rs:276:19:276:29 | maybe_digit |  |
-| test.rs:275:77:284:5 | BlockExpr | test.rs:275:5:284:5 | exit test_match_with_return_in_scrutinee (normal) |  |
-| test.rs:276:9:283:9 | MatchExpr | test.rs:275:77:284:5 | BlockExpr |  |
-| test.rs:276:16:280:9 | IfExpr | test.rs:281:13:281:27 | TupleStructPat |  |
-| test.rs:276:19:276:29 | maybe_digit | test.rs:276:34:276:37 | PathExpr |  |
-| test.rs:276:19:276:40 | ... == ... | test.rs:277:13:277:21 | ExprStmt | true |
-| test.rs:276:19:276:40 | ... == ... | test.rs:279:13:279:23 | maybe_digit | false |
-| test.rs:276:34:276:37 | PathExpr | test.rs:276:39:276:39 | 3 |  |
-| test.rs:276:34:276:40 | CallExpr | test.rs:276:19:276:40 | ... == ... |  |
-| test.rs:276:39:276:39 | 3 | test.rs:276:34:276:40 | CallExpr |  |
-| test.rs:277:13:277:20 | ReturnExpr | test.rs:275:5:284:5 | exit test_match_with_return_in_scrutinee (normal) | return |
-| test.rs:277:13:277:21 | ExprStmt | test.rs:277:20:277:20 | 3 |  |
-| test.rs:277:20:277:20 | 3 | test.rs:277:13:277:20 | ReturnExpr |  |
-| test.rs:278:16:280:9 | BlockExpr | test.rs:276:16:280:9 | IfExpr |  |
-| test.rs:279:13:279:23 | maybe_digit | test.rs:278:16:280:9 | BlockExpr |  |
-| test.rs:281:13:281:27 | TupleStructPat | test.rs:281:26:281:26 | x | match |
-| test.rs:281:13:281:27 | TupleStructPat | test.rs:282:13:282:24 | PathPat | no-match |
-| test.rs:281:26:281:26 | x | test.rs:281:32:281:32 | x | match |
-| test.rs:281:32:281:32 | x | test.rs:281:36:281:36 | 5 |  |
-| test.rs:281:32:281:36 | ... + ... | test.rs:276:9:283:9 | MatchExpr |  |
-| test.rs:281:36:281:36 | 5 | test.rs:281:32:281:36 | ... + ... |  |
-| test.rs:282:13:282:24 | PathPat | test.rs:282:29:282:29 | 5 | match |
-| test.rs:282:29:282:29 | 5 | test.rs:276:9:283:9 | MatchExpr |  |
-| test.rs:288:5:293:5 | enter test_infinite_loop | test.rs:289:9:291:9 | ExprStmt |  |
-| test.rs:289:9:291:9 | ExprStmt | test.rs:290:13:290:13 | 1 |  |
-| test.rs:289:14:291:9 | BlockExpr | test.rs:290:13:290:13 | 1 |  |
-| test.rs:290:13:290:13 | 1 | test.rs:289:14:291:9 | BlockExpr |  |
-| test.rs:295:5:298:5 | enter test_let_match | test.rs:295:23:295:23 | a |  |
-| test.rs:295:5:298:5 | exit test_let_match (normal) | test.rs:295:5:298:5 | exit test_let_match |  |
-| test.rs:295:23:295:23 | a | test.rs:295:23:295:36 | Param | match |
-| test.rs:295:23:295:36 | Param | test.rs:296:9:296:49 | LetStmt |  |
-| test.rs:295:39:298:5 | BlockExpr | test.rs:295:5:298:5 | exit test_let_match (normal) |  |
-| test.rs:296:9:296:49 | LetStmt | test.rs:296:23:296:23 | a |  |
-| test.rs:296:13:296:19 | TupleStructPat | test.rs:296:18:296:18 | n | match |
-| test.rs:296:13:296:19 | TupleStructPat | test.rs:296:32:296:46 | "Expected some" | no-match |
-| test.rs:296:18:296:18 | n | test.rs:297:9:297:9 | n | match |
-| test.rs:296:23:296:23 | a | test.rs:296:13:296:19 | TupleStructPat |  |
-| test.rs:296:32:296:46 | "Expected some" | test.rs:296:30:296:48 | BlockExpr |  |
-| test.rs:297:9:297:9 | n | test.rs:295:39:298:5 | BlockExpr |  |
-| test.rs:301:1:306:1 | enter dead_code | test.rs:302:5:304:5 | ExprStmt |  |
-| test.rs:301:1:306:1 | exit dead_code (normal) | test.rs:301:1:306:1 | exit dead_code |  |
-| test.rs:302:5:304:5 | ExprStmt | test.rs:302:9:302:12 | true |  |
-| test.rs:302:9:302:12 | true | test.rs:303:9:303:17 | ExprStmt | true |
-| test.rs:303:9:303:16 | ReturnExpr | test.rs:301:1:306:1 | exit dead_code (normal) | return |
-| test.rs:303:9:303:17 | ExprStmt | test.rs:303:16:303:16 | 0 |  |
-| test.rs:303:16:303:16 | 0 | test.rs:303:9:303:16 | ReturnExpr |  |
-| test.rs:308:1:321:1 | enter labelled_block1 | test.rs:309:5:320:6 | LetStmt |  |
-| test.rs:308:1:321:1 | exit labelled_block1 (normal) | test.rs:308:1:321:1 | exit labelled_block1 |  |
-| test.rs:308:29:321:1 | BlockExpr | test.rs:308:1:321:1 | exit labelled_block1 (normal) |  |
-| test.rs:309:5:320:6 | LetStmt | test.rs:310:9:310:19 | ExprStmt |  |
-| test.rs:309:9:309:14 | result | test.rs:308:29:321:1 | BlockExpr | match |
-| test.rs:309:18:320:5 | BlockExpr | test.rs:309:9:309:14 | result |  |
-| test.rs:310:9:310:16 | PathExpr | test.rs:310:9:310:18 | CallExpr |  |
-| test.rs:310:9:310:18 | CallExpr | test.rs:311:9:313:9 | ExprStmt |  |
-| test.rs:310:9:310:19 | ExprStmt | test.rs:310:9:310:16 | PathExpr |  |
-| test.rs:311:9:313:9 | ExprStmt | test.rs:311:12:311:28 | PathExpr |  |
-| test.rs:311:9:313:9 | IfExpr | test.rs:314:9:314:24 | ExprStmt |  |
-| test.rs:311:12:311:28 | PathExpr | test.rs:311:12:311:30 | CallExpr |  |
-| test.rs:311:12:311:30 | CallExpr | test.rs:311:9:313:9 | IfExpr | false |
-| test.rs:311:12:311:30 | CallExpr | test.rs:312:13:312:27 | ExprStmt | true |
-| test.rs:312:13:312:26 | BreakExpr | test.rs:309:18:320:5 | BlockExpr | break |
-| test.rs:312:13:312:27 | ExprStmt | test.rs:312:26:312:26 | 1 |  |
-| test.rs:312:26:312:26 | 1 | test.rs:312:13:312:26 | BreakExpr |  |
-| test.rs:314:9:314:21 | PathExpr | test.rs:314:9:314:23 | CallExpr |  |
-| test.rs:314:9:314:23 | CallExpr | test.rs:315:9:317:9 | ExprStmt |  |
-| test.rs:314:9:314:24 | ExprStmt | test.rs:314:9:314:21 | PathExpr |  |
-| test.rs:315:9:317:9 | ExprStmt | test.rs:315:12:315:28 | PathExpr |  |
-| test.rs:315:9:317:9 | IfExpr | test.rs:318:9:318:24 | ExprStmt |  |
-| test.rs:315:12:315:28 | PathExpr | test.rs:315:12:315:30 | CallExpr |  |
-| test.rs:315:12:315:30 | CallExpr | test.rs:315:9:317:9 | IfExpr | false |
-| test.rs:315:12:315:30 | CallExpr | test.rs:316:13:316:27 | ExprStmt | true |
-| test.rs:316:13:316:26 | BreakExpr | test.rs:309:18:320:5 | BlockExpr | break |
-| test.rs:316:13:316:27 | ExprStmt | test.rs:316:26:316:26 | 2 |  |
-| test.rs:316:26:316:26 | 2 | test.rs:316:13:316:26 | BreakExpr |  |
-| test.rs:318:9:318:21 | PathExpr | test.rs:318:9:318:23 | CallExpr |  |
-| test.rs:318:9:318:23 | CallExpr | test.rs:319:9:319:9 | 3 |  |
-| test.rs:318:9:318:24 | ExprStmt | test.rs:318:9:318:21 | PathExpr |  |
-| test.rs:319:9:319:9 | 3 | test.rs:309:18:320:5 | BlockExpr |  |
-| test.rs:323:1:331:1 | enter labelled_block2 | test.rs:324:5:330:6 | LetStmt |  |
-| test.rs:323:1:331:1 | exit labelled_block2 (normal) | test.rs:323:1:331:1 | exit labelled_block2 |  |
-| test.rs:323:29:331:1 | BlockExpr | test.rs:323:1:331:1 | exit labelled_block2 (normal) |  |
-| test.rs:324:5:330:6 | LetStmt | test.rs:325:9:325:34 | LetStmt |  |
-| test.rs:324:9:324:14 | result | test.rs:323:29:331:1 | BlockExpr | match |
-| test.rs:324:18:330:5 | BlockExpr | test.rs:324:9:324:14 | result |  |
-| test.rs:325:9:325:34 | LetStmt | test.rs:325:30:325:33 | PathExpr |  |
-| test.rs:325:13:325:13 | x | test.rs:326:9:328:10 | LetStmt | match |
-| test.rs:325:30:325:33 | PathExpr | test.rs:325:13:325:13 | x |  |
-| test.rs:326:9:328:10 | LetStmt | test.rs:326:23:326:23 | x |  |
-| test.rs:326:13:326:19 | TupleStructPat | test.rs:326:18:326:18 | y | match |
-| test.rs:326:13:326:19 | TupleStructPat | test.rs:327:13:327:27 | ExprStmt | no-match |
-| test.rs:326:18:326:18 | y | test.rs:329:9:329:9 | x | match |
-| test.rs:326:23:326:23 | x | test.rs:326:13:326:19 | TupleStructPat |  |
-| test.rs:327:13:327:26 | BreakExpr | test.rs:324:18:330:5 | BlockExpr | break |
-| test.rs:327:13:327:27 | ExprStmt | test.rs:327:26:327:26 | 1 |  |
-| test.rs:327:26:327:26 | 1 | test.rs:327:13:327:26 | BreakExpr |  |
-| test.rs:329:9:329:9 | x | test.rs:324:18:330:5 | BlockExpr |  |
-| test.rs:333:1:339:1 | enter test_nested_function | test.rs:334:5:334:18 | LetStmt |  |
-| test.rs:333:1:339:1 | exit test_nested_function (normal) | test.rs:333:1:339:1 | exit test_nested_function |  |
-| test.rs:333:27:339:1 | BlockExpr | test.rs:333:1:339:1 | exit test_nested_function (normal) |  |
-| test.rs:334:5:334:18 | LetStmt | test.rs:334:17:334:17 | 0 |  |
-| test.rs:334:9:334:13 | x | test.rs:335:5:337:5 | nested | match |
-| test.rs:334:17:334:17 | 0 | test.rs:334:9:334:13 | x |  |
-| test.rs:335:5:337:5 | enter nested | test.rs:335:15:335:15 | x |  |
-| test.rs:335:5:337:5 | exit nested (normal) | test.rs:335:5:337:5 | exit nested |  |
-| test.rs:335:5:337:5 | nested | test.rs:338:5:338:19 | ExprStmt |  |
-| test.rs:335:15:335:15 | x | test.rs:335:15:335:25 | Param | match |
-| test.rs:335:15:335:25 | Param | test.rs:336:9:336:16 | ExprStmt |  |
-| test.rs:335:28:337:5 | BlockExpr | test.rs:335:5:337:5 | exit nested (normal) |  |
-| test.rs:336:9:336:10 | * ... | test.rs:336:15:336:15 | 1 |  |
-| test.rs:336:9:336:15 | ... += ... | test.rs:335:28:337:5 | BlockExpr |  |
-| test.rs:336:9:336:16 | ExprStmt | test.rs:336:10:336:10 | x |  |
-| test.rs:336:10:336:10 | x | test.rs:336:9:336:10 | * ... |  |
-| test.rs:336:15:336:15 | 1 | test.rs:336:9:336:15 | ... += ... |  |
-| test.rs:338:5:338:10 | PathExpr | test.rs:338:17:338:17 | x |  |
-| test.rs:338:5:338:18 | CallExpr | test.rs:333:27:339:1 | BlockExpr |  |
-| test.rs:338:5:338:19 | ExprStmt | test.rs:338:5:338:10 | PathExpr |  |
-| test.rs:338:12:338:17 | RefExpr | test.rs:338:5:338:18 | CallExpr |  |
-| test.rs:338:17:338:17 | x | test.rs:338:12:338:17 | RefExpr |  |
+| test.rs:250:5:256:5 | enter test_if_or_operator | test.rs:250:28:250:28 | a |  |
+| test.rs:250:5:256:5 | exit test_if_or_operator (normal) | test.rs:250:5:256:5 | exit test_if_or_operator |  |
+| test.rs:250:28:250:28 | a | test.rs:250:28:250:34 | Param | match |
+| test.rs:250:28:250:34 | Param | test.rs:250:37:250:37 | b |  |
+| test.rs:250:37:250:37 | b | test.rs:250:37:250:42 | Param | match |
+| test.rs:250:37:250:42 | Param | test.rs:250:45:250:45 | c |  |
+| test.rs:250:45:250:45 | c | test.rs:250:45:250:51 | Param | match |
+| test.rs:250:45:250:51 | Param | test.rs:251:12:251:12 | a |  |
+| test.rs:250:62:256:5 | BlockExpr | test.rs:250:5:256:5 | exit test_if_or_operator (normal) |  |
+| test.rs:251:9:255:9 | IfExpr | test.rs:250:62:256:5 | BlockExpr |  |
+| test.rs:251:12:251:12 | a | test.rs:251:12:251:17 | [boolean(true)] ... \|\| ... | true |
+| test.rs:251:12:251:12 | a | test.rs:251:17:251:17 | b | false |
+| test.rs:251:12:251:17 | [boolean(false)] ... \|\| ... | test.rs:251:22:251:22 | c | false |
+| test.rs:251:12:251:17 | [boolean(true)] ... \|\| ... | test.rs:251:12:251:22 | [boolean(true)] ... \|\| ... | true |
+| test.rs:251:12:251:22 | [boolean(false)] ... \|\| ... | test.rs:254:13:254:17 | false | false |
+| test.rs:251:12:251:22 | [boolean(true)] ... \|\| ... | test.rs:252:13:252:16 | true | true |
+| test.rs:251:17:251:17 | b | test.rs:251:12:251:17 | [boolean(false)] ... \|\| ... | false |
+| test.rs:251:17:251:17 | b | test.rs:251:12:251:17 | [boolean(true)] ... \|\| ... | true |
+| test.rs:251:22:251:22 | c | test.rs:251:12:251:22 | [boolean(false)] ... \|\| ... | false |
+| test.rs:251:22:251:22 | c | test.rs:251:12:251:22 | [boolean(true)] ... \|\| ... | true |
+| test.rs:251:24:253:9 | BlockExpr | test.rs:251:9:255:9 | IfExpr |  |
+| test.rs:252:13:252:16 | true | test.rs:251:24:253:9 | BlockExpr |  |
+| test.rs:253:16:255:9 | BlockExpr | test.rs:251:9:255:9 | IfExpr |  |
+| test.rs:254:13:254:17 | false | test.rs:253:16:255:9 | BlockExpr |  |
+| test.rs:258:5:264:5 | enter test_if_not_operator | test.rs:258:29:258:29 | a |  |
+| test.rs:258:5:264:5 | exit test_if_not_operator (normal) | test.rs:258:5:264:5 | exit test_if_not_operator |  |
+| test.rs:258:29:258:29 | a | test.rs:258:29:258:35 | Param | match |
+| test.rs:258:29:258:35 | Param | test.rs:259:13:259:13 | a |  |
+| test.rs:258:46:264:5 | BlockExpr | test.rs:258:5:264:5 | exit test_if_not_operator (normal) |  |
+| test.rs:259:9:263:9 | IfExpr | test.rs:258:46:264:5 | BlockExpr |  |
+| test.rs:259:12:259:13 | [boolean(false)] ! ... | test.rs:262:13:262:17 | false | false |
+| test.rs:259:12:259:13 | [boolean(true)] ! ... | test.rs:260:13:260:16 | true | true |
+| test.rs:259:13:259:13 | a | test.rs:259:12:259:13 | [boolean(false)] ! ... | true |
+| test.rs:259:13:259:13 | a | test.rs:259:12:259:13 | [boolean(true)] ! ... | false |
+| test.rs:259:15:261:9 | BlockExpr | test.rs:259:9:263:9 | IfExpr |  |
+| test.rs:260:13:260:16 | true | test.rs:259:15:261:9 | BlockExpr |  |
+| test.rs:261:16:263:9 | BlockExpr | test.rs:259:9:263:9 | IfExpr |  |
+| test.rs:262:13:262:17 | false | test.rs:261:16:263:9 | BlockExpr |  |
+| test.rs:269:5:271:5 | enter test_question_mark_operator_1 | test.rs:269:38:269:38 | s |  |
+| test.rs:269:5:271:5 | exit test_question_mark_operator_1 (normal) | test.rs:269:5:271:5 | exit test_question_mark_operator_1 |  |
+| test.rs:269:38:269:38 | s | test.rs:269:38:269:44 | Param | match |
+| test.rs:269:38:269:44 | Param | test.rs:270:9:270:11 | PathExpr |  |
+| test.rs:269:62:271:5 | BlockExpr | test.rs:269:5:271:5 | exit test_question_mark_operator_1 (normal) |  |
+| test.rs:270:9:270:11 | PathExpr | test.rs:270:9:270:26 | MethodCallExpr |  |
+| test.rs:270:9:270:26 | MethodCallExpr | test.rs:270:9:270:27 | TryExpr |  |
+| test.rs:270:9:270:27 | TryExpr | test.rs:269:5:271:5 | exit test_question_mark_operator_1 (normal) | return |
+| test.rs:270:9:270:27 | TryExpr | test.rs:270:31:270:31 | 4 | match |
+| test.rs:270:9:270:31 | ... + ... | test.rs:269:62:271:5 | BlockExpr |  |
+| test.rs:270:31:270:31 | 4 | test.rs:270:9:270:31 | ... + ... |  |
+| test.rs:273:5:278:5 | enter test_question_mark_operator_2 | test.rs:273:38:273:38 | b |  |
+| test.rs:273:5:278:5 | exit test_question_mark_operator_2 (normal) | test.rs:273:5:278:5 | exit test_question_mark_operator_2 |  |
+| test.rs:273:38:273:38 | b | test.rs:273:38:273:52 | Param | match |
+| test.rs:273:38:273:52 | Param | test.rs:274:15:274:15 | b |  |
+| test.rs:273:71:278:5 | BlockExpr | test.rs:273:5:278:5 | exit test_question_mark_operator_2 (normal) |  |
+| test.rs:274:9:277:9 | MatchExpr | test.rs:273:71:278:5 | BlockExpr |  |
+| test.rs:274:15:274:15 | b | test.rs:274:15:274:16 | TryExpr |  |
+| test.rs:274:15:274:16 | TryExpr | test.rs:273:5:278:5 | exit test_question_mark_operator_2 (normal) | return |
+| test.rs:274:15:274:16 | TryExpr | test.rs:275:13:275:16 | LiteralPat | match |
+| test.rs:275:13:275:16 | LiteralPat | test.rs:275:21:275:24 | PathExpr | match |
+| test.rs:275:13:275:16 | LiteralPat | test.rs:276:13:276:17 | LiteralPat | no-match |
+| test.rs:275:21:275:24 | PathExpr | test.rs:275:26:275:30 | false |  |
+| test.rs:275:21:275:31 | CallExpr | test.rs:274:9:277:9 | MatchExpr |  |
+| test.rs:275:26:275:30 | false | test.rs:275:21:275:31 | CallExpr |  |
+| test.rs:276:13:276:17 | LiteralPat | test.rs:276:22:276:25 | PathExpr | match |
+| test.rs:276:22:276:25 | PathExpr | test.rs:276:27:276:30 | true |  |
+| test.rs:276:22:276:31 | CallExpr | test.rs:274:9:277:9 | MatchExpr |  |
+| test.rs:276:27:276:30 | true | test.rs:276:22:276:31 | CallExpr |  |
+| test.rs:283:5:289:5 | enter test_match | test.rs:283:19:283:29 | maybe_digit |  |
+| test.rs:283:5:289:5 | exit test_match (normal) | test.rs:283:5:289:5 | exit test_match |  |
+| test.rs:283:19:283:29 | maybe_digit | test.rs:283:19:283:42 | Param | match |
+| test.rs:283:19:283:42 | Param | test.rs:284:15:284:25 | maybe_digit |  |
+| test.rs:283:52:289:5 | BlockExpr | test.rs:283:5:289:5 | exit test_match (normal) |  |
+| test.rs:284:9:288:9 | MatchExpr | test.rs:283:52:289:5 | BlockExpr |  |
+| test.rs:284:15:284:25 | maybe_digit | test.rs:285:13:285:27 | TupleStructPat |  |
+| test.rs:285:13:285:27 | TupleStructPat | test.rs:285:26:285:26 | x | match |
+| test.rs:285:13:285:27 | TupleStructPat | test.rs:286:13:286:27 | TupleStructPat | no-match |
+| test.rs:285:26:285:26 | x | test.rs:285:32:285:32 | x | match |
+| test.rs:285:32:285:32 | x | test.rs:285:36:285:37 | 10 |  |
+| test.rs:285:32:285:37 | ... < ... | test.rs:285:42:285:42 | x | true |
+| test.rs:285:32:285:37 | ... < ... | test.rs:286:13:286:27 | TupleStructPat | false |
+| test.rs:285:36:285:37 | 10 | test.rs:285:32:285:37 | ... < ... |  |
+| test.rs:285:42:285:42 | x | test.rs:285:46:285:46 | 5 |  |
+| test.rs:285:42:285:46 | ... + ... | test.rs:284:9:288:9 | MatchExpr |  |
+| test.rs:285:46:285:46 | 5 | test.rs:285:42:285:46 | ... + ... |  |
+| test.rs:286:13:286:27 | TupleStructPat | test.rs:286:26:286:26 | x | match |
+| test.rs:286:13:286:27 | TupleStructPat | test.rs:287:13:287:24 | PathPat | no-match |
+| test.rs:286:26:286:26 | x | test.rs:286:32:286:32 | x | match |
+| test.rs:286:32:286:32 | x | test.rs:284:9:288:9 | MatchExpr |  |
+| test.rs:287:13:287:24 | PathPat | test.rs:287:29:287:29 | 5 | match |
+| test.rs:287:29:287:29 | 5 | test.rs:284:9:288:9 | MatchExpr |  |
+| test.rs:291:5:300:5 | enter test_match_with_return_in_scrutinee | test.rs:291:44:291:54 | maybe_digit |  |
+| test.rs:291:5:300:5 | exit test_match_with_return_in_scrutinee (normal) | test.rs:291:5:300:5 | exit test_match_with_return_in_scrutinee |  |
+| test.rs:291:44:291:54 | maybe_digit | test.rs:291:44:291:67 | Param | match |
+| test.rs:291:44:291:67 | Param | test.rs:292:19:292:29 | maybe_digit |  |
+| test.rs:291:77:300:5 | BlockExpr | test.rs:291:5:300:5 | exit test_match_with_return_in_scrutinee (normal) |  |
+| test.rs:292:9:299:9 | MatchExpr | test.rs:291:77:300:5 | BlockExpr |  |
+| test.rs:292:16:296:9 | IfExpr | test.rs:297:13:297:27 | TupleStructPat |  |
+| test.rs:292:19:292:29 | maybe_digit | test.rs:292:34:292:37 | PathExpr |  |
+| test.rs:292:19:292:40 | ... == ... | test.rs:293:13:293:21 | ExprStmt | true |
+| test.rs:292:19:292:40 | ... == ... | test.rs:295:13:295:23 | maybe_digit | false |
+| test.rs:292:34:292:37 | PathExpr | test.rs:292:39:292:39 | 3 |  |
+| test.rs:292:34:292:40 | CallExpr | test.rs:292:19:292:40 | ... == ... |  |
+| test.rs:292:39:292:39 | 3 | test.rs:292:34:292:40 | CallExpr |  |
+| test.rs:293:13:293:20 | ReturnExpr | test.rs:291:5:300:5 | exit test_match_with_return_in_scrutinee (normal) | return |
+| test.rs:293:13:293:21 | ExprStmt | test.rs:293:20:293:20 | 3 |  |
+| test.rs:293:20:293:20 | 3 | test.rs:293:13:293:20 | ReturnExpr |  |
+| test.rs:294:16:296:9 | BlockExpr | test.rs:292:16:296:9 | IfExpr |  |
+| test.rs:295:13:295:23 | maybe_digit | test.rs:294:16:296:9 | BlockExpr |  |
+| test.rs:297:13:297:27 | TupleStructPat | test.rs:297:26:297:26 | x | match |
+| test.rs:297:13:297:27 | TupleStructPat | test.rs:298:13:298:24 | PathPat | no-match |
+| test.rs:297:26:297:26 | x | test.rs:297:32:297:32 | x | match |
+| test.rs:297:32:297:32 | x | test.rs:297:36:297:36 | 5 |  |
+| test.rs:297:32:297:36 | ... + ... | test.rs:292:9:299:9 | MatchExpr |  |
+| test.rs:297:36:297:36 | 5 | test.rs:297:32:297:36 | ... + ... |  |
+| test.rs:298:13:298:24 | PathPat | test.rs:298:29:298:29 | 5 | match |
+| test.rs:298:29:298:29 | 5 | test.rs:292:9:299:9 | MatchExpr |  |
+| test.rs:302:5:307:5 | enter test_match_and | test.rs:302:23:302:26 | cond |  |
+| test.rs:302:5:307:5 | exit test_match_and (normal) | test.rs:302:5:307:5 | exit test_match_and |  |
+| test.rs:302:23:302:26 | cond | test.rs:302:23:302:32 | Param | match |
+| test.rs:302:23:302:32 | Param | test.rs:302:35:302:35 | r |  |
+| test.rs:302:35:302:35 | r | test.rs:302:35:302:48 | Param | match |
+| test.rs:302:35:302:48 | Param | test.rs:303:16:303:16 | r |  |
+| test.rs:302:59:307:5 | BlockExpr | test.rs:302:5:307:5 | exit test_match_and (normal) |  |
+| test.rs:303:9:306:18 | ... && ... | test.rs:302:59:307:5 | BlockExpr |  |
+| test.rs:303:10:306:9 | [boolean(false)] MatchExpr | test.rs:303:9:306:18 | ... && ... | false |
+| test.rs:303:10:306:9 | [boolean(true)] MatchExpr | test.rs:306:15:306:18 | cond | true |
+| test.rs:303:16:303:16 | r | test.rs:304:13:304:19 | TupleStructPat |  |
+| test.rs:304:13:304:19 | TupleStructPat | test.rs:304:18:304:18 | a | match |
+| test.rs:304:13:304:19 | TupleStructPat | test.rs:305:13:305:13 | WildcardPat | no-match |
+| test.rs:304:18:304:18 | a | test.rs:304:24:304:24 | a | match |
+| test.rs:304:24:304:24 | a | test.rs:303:10:306:9 | [boolean(false)] MatchExpr | false |
+| test.rs:304:24:304:24 | a | test.rs:303:10:306:9 | [boolean(true)] MatchExpr | true |
+| test.rs:305:13:305:13 | WildcardPat | test.rs:305:18:305:22 | false | match |
+| test.rs:305:18:305:22 | false | test.rs:303:10:306:9 | [boolean(false)] MatchExpr | false |
+| test.rs:306:15:306:18 | cond | test.rs:303:9:306:18 | ... && ... |  |
+| test.rs:309:5:314:5 | enter test_match_with_no_arms | test.rs:309:35:309:35 | r |  |
+| test.rs:309:5:314:5 | exit test_match_with_no_arms (normal) | test.rs:309:5:314:5 | exit test_match_with_no_arms |  |
+| test.rs:309:35:309:35 | r | test.rs:309:35:309:58 | Param | match |
+| test.rs:309:35:309:58 | Param | test.rs:310:15:310:15 | r |  |
+| test.rs:309:66:314:5 | BlockExpr | test.rs:309:5:314:5 | exit test_match_with_no_arms (normal) |  |
+| test.rs:310:9:313:9 | MatchExpr | test.rs:309:66:314:5 | BlockExpr |  |
+| test.rs:310:15:310:15 | r | test.rs:311:13:311:21 | TupleStructPat |  |
+| test.rs:311:13:311:21 | TupleStructPat | test.rs:311:16:311:20 | value | match |
+| test.rs:311:13:311:21 | TupleStructPat | test.rs:312:13:312:22 | TupleStructPat | no-match |
+| test.rs:311:16:311:20 | value | test.rs:311:26:311:30 | value | match |
+| test.rs:311:26:311:30 | value | test.rs:310:9:313:9 | MatchExpr |  |
+| test.rs:312:13:312:22 | TupleStructPat | test.rs:312:17:312:21 | never | match |
+| test.rs:312:17:312:21 | never | test.rs:312:33:312:37 | never | match |
+| test.rs:312:27:312:40 | MatchExpr | test.rs:310:9:313:9 | MatchExpr |  |
+| test.rs:312:33:312:37 | never | test.rs:312:27:312:40 | MatchExpr |  |
+| test.rs:319:5:322:5 | enter test_let_match | test.rs:319:23:319:23 | a |  |
+| test.rs:319:5:322:5 | exit test_let_match (normal) | test.rs:319:5:322:5 | exit test_let_match |  |
+| test.rs:319:23:319:23 | a | test.rs:319:23:319:36 | Param | match |
+| test.rs:319:23:319:36 | Param | test.rs:320:9:320:49 | LetStmt |  |
+| test.rs:319:39:322:5 | BlockExpr | test.rs:319:5:322:5 | exit test_let_match (normal) |  |
+| test.rs:320:9:320:49 | LetStmt | test.rs:320:23:320:23 | a |  |
+| test.rs:320:13:320:19 | TupleStructPat | test.rs:320:18:320:18 | n | match |
+| test.rs:320:13:320:19 | TupleStructPat | test.rs:320:32:320:46 | "Expected some" | no-match |
+| test.rs:320:18:320:18 | n | test.rs:321:9:321:9 | n | match |
+| test.rs:320:23:320:23 | a | test.rs:320:13:320:19 | TupleStructPat |  |
+| test.rs:320:32:320:46 | "Expected some" | test.rs:320:30:320:48 | BlockExpr |  |
+| test.rs:321:9:321:9 | n | test.rs:319:39:322:5 | BlockExpr |  |
+| test.rs:324:5:330:5 | enter test_let_with_return | test.rs:324:29:324:29 | m |  |
+| test.rs:324:5:330:5 | exit test_let_with_return (normal) | test.rs:324:5:330:5 | exit test_let_with_return |  |
+| test.rs:324:29:324:29 | m | test.rs:324:29:324:42 | Param | match |
+| test.rs:324:29:324:42 | Param | test.rs:325:9:328:10 | LetStmt |  |
+| test.rs:324:45:330:5 | BlockExpr | test.rs:324:5:330:5 | exit test_let_with_return (normal) |  |
+| test.rs:325:9:328:10 | LetStmt | test.rs:325:25:325:25 | m |  |
+| test.rs:325:13:325:15 | ret | test.rs:329:9:329:12 | true | match |
+| test.rs:325:19:328:9 | MatchExpr | test.rs:325:13:325:15 | ret |  |
+| test.rs:325:25:325:25 | m | test.rs:326:13:326:21 | TupleStructPat |  |
+| test.rs:326:13:326:21 | TupleStructPat | test.rs:326:18:326:20 | ret | match |
+| test.rs:326:13:326:21 | TupleStructPat | test.rs:327:13:327:16 | None | no-match |
+| test.rs:326:18:326:20 | ret | test.rs:326:26:326:28 | ret | match |
+| test.rs:326:26:326:28 | ret | test.rs:325:19:328:9 | MatchExpr |  |
+| test.rs:327:13:327:16 | None | test.rs:327:28:327:32 | false | match |
+| test.rs:327:21:327:32 | ReturnExpr | test.rs:324:5:330:5 | exit test_let_with_return (normal) | return |
+| test.rs:327:28:327:32 | false | test.rs:327:21:327:32 | ReturnExpr |  |
+| test.rs:329:9:329:12 | true | test.rs:324:45:330:5 | BlockExpr |  |
+| test.rs:335:5:338:5 | enter empty_tuple_pattern | test.rs:335:28:335:31 | unit |  |
+| test.rs:335:5:338:5 | exit empty_tuple_pattern (normal) | test.rs:335:5:338:5 | exit empty_tuple_pattern |  |
+| test.rs:335:28:335:31 | unit | test.rs:335:28:335:35 | Param | match |
+| test.rs:335:28:335:35 | Param | test.rs:336:9:336:22 | LetStmt |  |
+| test.rs:336:9:336:22 | LetStmt | test.rs:336:18:336:21 | unit |  |
+| test.rs:336:13:336:14 | TuplePat | test.rs:337:9:337:15 | ExprStmt | match |
+| test.rs:336:18:336:21 | unit | test.rs:336:13:336:14 | TuplePat |  |
+| test.rs:337:9:337:14 | ReturnExpr | test.rs:335:5:338:5 | exit empty_tuple_pattern (normal) | return |
+| test.rs:337:9:337:15 | ExprStmt | test.rs:337:9:337:14 | ReturnExpr |  |
+| test.rs:342:5:346:5 | enter empty_struct_pattern | test.rs:342:29:342:30 | st |  |
+| test.rs:342:5:346:5 | exit empty_struct_pattern (normal) | test.rs:342:5:346:5 | exit empty_struct_pattern |  |
+| test.rs:342:29:342:30 | st | test.rs:342:29:342:40 | Param | match |
+| test.rs:342:29:342:40 | Param | test.rs:343:15:343:16 | st |  |
+| test.rs:342:50:346:5 | BlockExpr | test.rs:342:5:346:5 | exit empty_struct_pattern (normal) |  |
+| test.rs:343:9:345:9 | MatchExpr | test.rs:342:50:346:5 | BlockExpr |  |
+| test.rs:343:15:343:16 | st | test.rs:344:13:344:23 | RecordPat |  |
+| test.rs:344:13:344:23 | RecordPat | test.rs:344:28:344:28 | 1 | match |
+| test.rs:344:28:344:28 | 1 | test.rs:343:9:345:9 | MatchExpr |  |
+| test.rs:348:5:355:5 | enter range_pattern | test.rs:349:15:349:16 | 42 |  |
+| test.rs:348:5:355:5 | exit range_pattern (normal) | test.rs:348:5:355:5 | exit range_pattern |  |
+| test.rs:348:31:355:5 | BlockExpr | test.rs:348:5:355:5 | exit range_pattern (normal) |  |
+| test.rs:349:9:354:9 | MatchExpr | test.rs:348:31:355:5 | BlockExpr |  |
+| test.rs:349:15:349:16 | 42 | test.rs:350:13:350:15 | RangePat |  |
+| test.rs:350:13:350:15 | RangePat | test.rs:350:15:350:15 | LiteralPat | match |
+| test.rs:350:13:350:15 | RangePat | test.rs:351:13:351:16 | RangePat | no-match |
+| test.rs:350:15:350:15 | LiteralPat | test.rs:350:20:350:20 | 1 | match |
+| test.rs:350:15:350:15 | LiteralPat | test.rs:351:13:351:16 | RangePat | no-match |
+| test.rs:350:20:350:20 | 1 | test.rs:349:9:354:9 | MatchExpr |  |
+| test.rs:351:13:351:13 | LiteralPat | test.rs:351:16:351:16 | LiteralPat | match |
+| test.rs:351:13:351:13 | LiteralPat | test.rs:352:13:352:15 | RangePat | no-match |
+| test.rs:351:13:351:16 | RangePat | test.rs:351:13:351:13 | LiteralPat | match |
+| test.rs:351:13:351:16 | RangePat | test.rs:352:13:352:15 | RangePat | no-match |
+| test.rs:351:16:351:16 | LiteralPat | test.rs:351:21:351:21 | 2 | match |
+| test.rs:351:16:351:16 | LiteralPat | test.rs:352:13:352:15 | RangePat | no-match |
+| test.rs:351:21:351:21 | 2 | test.rs:349:9:354:9 | MatchExpr |  |
+| test.rs:352:13:352:13 | LiteralPat | test.rs:352:20:352:20 | 3 | match |
+| test.rs:352:13:352:13 | LiteralPat | test.rs:353:13:353:14 | RestPat | no-match |
+| test.rs:352:13:352:15 | RangePat | test.rs:352:13:352:13 | LiteralPat | match |
+| test.rs:352:13:352:15 | RangePat | test.rs:353:13:353:14 | RestPat | no-match |
+| test.rs:352:20:352:20 | 3 | test.rs:349:9:354:9 | MatchExpr |  |
+| test.rs:353:13:353:14 | RestPat | test.rs:353:19:353:19 | 4 | match |
+| test.rs:353:19:353:19 | 4 | test.rs:349:9:354:9 | MatchExpr |  |
+| test.rs:359:5:364:5 | enter test_infinite_loop | test.rs:360:9:362:9 | ExprStmt |  |
+| test.rs:360:9:362:9 | ExprStmt | test.rs:361:13:361:13 | 1 |  |
+| test.rs:360:14:362:9 | BlockExpr | test.rs:361:13:361:13 | 1 |  |
+| test.rs:361:13:361:13 | 1 | test.rs:360:14:362:9 | BlockExpr |  |
+| test.rs:367:1:372:1 | enter dead_code | test.rs:368:5:370:5 | ExprStmt |  |
+| test.rs:367:1:372:1 | exit dead_code (normal) | test.rs:367:1:372:1 | exit dead_code |  |
+| test.rs:368:5:370:5 | ExprStmt | test.rs:368:9:368:12 | true |  |
+| test.rs:368:9:368:12 | true | test.rs:369:9:369:17 | ExprStmt | true |
+| test.rs:369:9:369:16 | ReturnExpr | test.rs:367:1:372:1 | exit dead_code (normal) | return |
+| test.rs:369:9:369:17 | ExprStmt | test.rs:369:16:369:16 | 0 |  |
+| test.rs:369:16:369:16 | 0 | test.rs:369:9:369:16 | ReturnExpr |  |
+| test.rs:374:1:387:1 | enter labelled_block1 | test.rs:375:5:386:6 | LetStmt |  |
+| test.rs:374:1:387:1 | exit labelled_block1 (normal) | test.rs:374:1:387:1 | exit labelled_block1 |  |
+| test.rs:374:29:387:1 | BlockExpr | test.rs:374:1:387:1 | exit labelled_block1 (normal) |  |
+| test.rs:375:5:386:6 | LetStmt | test.rs:376:9:376:19 | ExprStmt |  |
+| test.rs:375:9:375:14 | result | test.rs:374:29:387:1 | BlockExpr | match |
+| test.rs:375:18:386:5 | BlockExpr | test.rs:375:9:375:14 | result |  |
+| test.rs:376:9:376:16 | PathExpr | test.rs:376:9:376:18 | CallExpr |  |
+| test.rs:376:9:376:18 | CallExpr | test.rs:377:9:379:9 | ExprStmt |  |
+| test.rs:376:9:376:19 | ExprStmt | test.rs:376:9:376:16 | PathExpr |  |
+| test.rs:377:9:379:9 | ExprStmt | test.rs:377:12:377:28 | PathExpr |  |
+| test.rs:377:9:379:9 | IfExpr | test.rs:380:9:380:24 | ExprStmt |  |
+| test.rs:377:12:377:28 | PathExpr | test.rs:377:12:377:30 | CallExpr |  |
+| test.rs:377:12:377:30 | CallExpr | test.rs:377:9:379:9 | IfExpr | false |
+| test.rs:377:12:377:30 | CallExpr | test.rs:378:13:378:27 | ExprStmt | true |
+| test.rs:378:13:378:26 | BreakExpr | test.rs:375:18:386:5 | BlockExpr | break |
+| test.rs:378:13:378:27 | ExprStmt | test.rs:378:26:378:26 | 1 |  |
+| test.rs:378:26:378:26 | 1 | test.rs:378:13:378:26 | BreakExpr |  |
+| test.rs:380:9:380:21 | PathExpr | test.rs:380:9:380:23 | CallExpr |  |
+| test.rs:380:9:380:23 | CallExpr | test.rs:381:9:383:9 | ExprStmt |  |
+| test.rs:380:9:380:24 | ExprStmt | test.rs:380:9:380:21 | PathExpr |  |
+| test.rs:381:9:383:9 | ExprStmt | test.rs:381:12:381:28 | PathExpr |  |
+| test.rs:381:9:383:9 | IfExpr | test.rs:384:9:384:24 | ExprStmt |  |
+| test.rs:381:12:381:28 | PathExpr | test.rs:381:12:381:30 | CallExpr |  |
+| test.rs:381:12:381:30 | CallExpr | test.rs:381:9:383:9 | IfExpr | false |
+| test.rs:381:12:381:30 | CallExpr | test.rs:382:13:382:27 | ExprStmt | true |
+| test.rs:382:13:382:26 | BreakExpr | test.rs:375:18:386:5 | BlockExpr | break |
+| test.rs:382:13:382:27 | ExprStmt | test.rs:382:26:382:26 | 2 |  |
+| test.rs:382:26:382:26 | 2 | test.rs:382:13:382:26 | BreakExpr |  |
+| test.rs:384:9:384:21 | PathExpr | test.rs:384:9:384:23 | CallExpr |  |
+| test.rs:384:9:384:23 | CallExpr | test.rs:385:9:385:9 | 3 |  |
+| test.rs:384:9:384:24 | ExprStmt | test.rs:384:9:384:21 | PathExpr |  |
+| test.rs:385:9:385:9 | 3 | test.rs:375:18:386:5 | BlockExpr |  |
+| test.rs:389:1:397:1 | enter labelled_block2 | test.rs:390:5:396:6 | LetStmt |  |
+| test.rs:389:1:397:1 | exit labelled_block2 (normal) | test.rs:389:1:397:1 | exit labelled_block2 |  |
+| test.rs:389:29:397:1 | BlockExpr | test.rs:389:1:397:1 | exit labelled_block2 (normal) |  |
+| test.rs:390:5:396:6 | LetStmt | test.rs:391:9:391:34 | LetStmt |  |
+| test.rs:390:9:390:14 | result | test.rs:389:29:397:1 | BlockExpr | match |
+| test.rs:390:18:396:5 | BlockExpr | test.rs:390:9:390:14 | result |  |
+| test.rs:391:9:391:34 | LetStmt | test.rs:391:30:391:33 | PathExpr |  |
+| test.rs:391:13:391:13 | x | test.rs:392:9:394:10 | LetStmt | match |
+| test.rs:391:30:391:33 | PathExpr | test.rs:391:13:391:13 | x |  |
+| test.rs:392:9:394:10 | LetStmt | test.rs:392:23:392:23 | x |  |
+| test.rs:392:13:392:19 | TupleStructPat | test.rs:392:18:392:18 | y | match |
+| test.rs:392:13:392:19 | TupleStructPat | test.rs:393:13:393:27 | ExprStmt | no-match |
+| test.rs:392:18:392:18 | y | test.rs:395:9:395:9 | x | match |
+| test.rs:392:23:392:23 | x | test.rs:392:13:392:19 | TupleStructPat |  |
+| test.rs:393:13:393:26 | BreakExpr | test.rs:390:18:396:5 | BlockExpr | break |
+| test.rs:393:13:393:27 | ExprStmt | test.rs:393:26:393:26 | 1 |  |
+| test.rs:393:26:393:26 | 1 | test.rs:393:13:393:26 | BreakExpr |  |
+| test.rs:395:9:395:9 | x | test.rs:390:18:396:5 | BlockExpr |  |
+| test.rs:399:1:405:1 | enter test_nested_function | test.rs:400:5:400:18 | LetStmt |  |
+| test.rs:399:1:405:1 | exit test_nested_function (normal) | test.rs:399:1:405:1 | exit test_nested_function |  |
+| test.rs:399:27:405:1 | BlockExpr | test.rs:399:1:405:1 | exit test_nested_function (normal) |  |
+| test.rs:400:5:400:18 | LetStmt | test.rs:400:17:400:17 | 0 |  |
+| test.rs:400:9:400:13 | x | test.rs:401:5:403:5 | nested | match |
+| test.rs:400:17:400:17 | 0 | test.rs:400:9:400:13 | x |  |
+| test.rs:401:5:403:5 | enter nested | test.rs:401:15:401:15 | x |  |
+| test.rs:401:5:403:5 | exit nested (normal) | test.rs:401:5:403:5 | exit nested |  |
+| test.rs:401:5:403:5 | nested | test.rs:404:5:404:19 | ExprStmt |  |
+| test.rs:401:15:401:15 | x | test.rs:401:15:401:25 | Param | match |
+| test.rs:401:15:401:25 | Param | test.rs:402:9:402:16 | ExprStmt |  |
+| test.rs:401:28:403:5 | BlockExpr | test.rs:401:5:403:5 | exit nested (normal) |  |
+| test.rs:402:9:402:10 | * ... | test.rs:402:15:402:15 | 1 |  |
+| test.rs:402:9:402:15 | ... += ... | test.rs:401:28:403:5 | BlockExpr |  |
+| test.rs:402:9:402:16 | ExprStmt | test.rs:402:10:402:10 | x |  |
+| test.rs:402:10:402:10 | x | test.rs:402:9:402:10 | * ... |  |
+| test.rs:402:15:402:15 | 1 | test.rs:402:9:402:15 | ... += ... |  |
+| test.rs:404:5:404:10 | PathExpr | test.rs:404:17:404:17 | x |  |
+| test.rs:404:5:404:18 | CallExpr | test.rs:399:27:405:1 | BlockExpr |  |
+| test.rs:404:5:404:19 | ExprStmt | test.rs:404:5:404:10 | PathExpr |  |
+| test.rs:404:12:404:17 | RefExpr | test.rs:404:5:404:18 | CallExpr |  |
+| test.rs:404:17:404:17 | x | test.rs:404:12:404:17 | RefExpr |  |
 breakTarget
-| test.rs:16:17:16:21 | BreakExpr | test.rs:10:9:22:9 | LoopExpr |
-| test.rs:30:21:30:25 | BreakExpr | test.rs:28:13:35:13 | LoopExpr |
-| test.rs:32:21:32:32 | BreakExpr | test.rs:27:9:36:9 | LoopExpr |
-| test.rs:34:17:34:28 | BreakExpr | test.rs:28:13:35:13 | LoopExpr |
-| test.rs:73:17:73:21 | BreakExpr | test.rs:70:9:76:9 | WhileExpr |
-| test.rs:83:17:83:21 | BreakExpr | test.rs:81:9:85:9 | WhileExpr |
-| test.rs:91:17:91:21 | BreakExpr | test.rs:89:9:94:9 | ForExpr |
-| test.rs:170:17:170:28 | BreakExpr | test.rs:168:13:173:9 | LoopExpr |
-| test.rs:183:17:183:35 | BreakExpr | test.rs:181:13:186:9 | LoopExpr |
-| test.rs:195:13:195:30 | BreakExpr | test.rs:194:13:196:9 | BlockExpr |
-| test.rs:312:13:312:26 | BreakExpr | test.rs:309:18:320:5 | BlockExpr |
-| test.rs:316:13:316:26 | BreakExpr | test.rs:309:18:320:5 | BlockExpr |
-| test.rs:327:13:327:26 | BreakExpr | test.rs:324:18:330:5 | BlockExpr |
+| test.rs:26:17:26:21 | BreakExpr | test.rs:20:9:32:9 | LoopExpr |
+| test.rs:40:21:40:25 | BreakExpr | test.rs:38:13:45:13 | LoopExpr |
+| test.rs:42:21:42:32 | BreakExpr | test.rs:37:9:46:9 | LoopExpr |
+| test.rs:44:17:44:28 | BreakExpr | test.rs:38:13:45:13 | LoopExpr |
+| test.rs:83:17:83:21 | BreakExpr | test.rs:80:9:86:9 | WhileExpr |
+| test.rs:93:17:93:21 | BreakExpr | test.rs:91:9:95:9 | WhileExpr |
+| test.rs:101:17:101:21 | BreakExpr | test.rs:99:9:104:9 | ForExpr |
+| test.rs:109:13:109:26 | BreakExpr | test.rs:108:9:110:9 | LoopExpr |
+| test.rs:186:17:186:28 | BreakExpr | test.rs:184:13:189:9 | LoopExpr |
+| test.rs:199:17:199:35 | BreakExpr | test.rs:197:13:202:9 | LoopExpr |
+| test.rs:211:13:211:30 | BreakExpr | test.rs:210:13:212:9 | BlockExpr |
+| test.rs:378:13:378:26 | BreakExpr | test.rs:375:18:386:5 | BlockExpr |
+| test.rs:382:13:382:26 | BreakExpr | test.rs:375:18:386:5 | BlockExpr |
+| test.rs:393:13:393:26 | BreakExpr | test.rs:390:18:396:5 | BlockExpr |
 continueTarget
-| test.rs:19:17:19:24 | ContinueExpr | test.rs:10:9:22:9 | LoopExpr |
-| test.rs:45:21:45:28 | ContinueExpr | test.rs:43:13:50:13 | LoopExpr |
-| test.rs:47:21:47:35 | ContinueExpr | test.rs:41:9:51:9 | LoopExpr |
-| test.rs:49:17:49:31 | ContinueExpr | test.rs:43:13:50:13 | LoopExpr |
-| test.rs:59:21:59:28 | ContinueExpr | test.rs:57:13:64:13 | LoopExpr |
-| test.rs:61:21:61:34 | ContinueExpr | test.rs:57:13:64:13 | LoopExpr |
-| test.rs:63:17:63:30 | ContinueExpr | test.rs:57:13:64:13 | LoopExpr |
+| test.rs:29:17:29:24 | ContinueExpr | test.rs:20:9:32:9 | LoopExpr |
+| test.rs:55:21:55:28 | ContinueExpr | test.rs:53:13:60:13 | LoopExpr |
+| test.rs:57:21:57:35 | ContinueExpr | test.rs:51:9:61:9 | LoopExpr |
+| test.rs:59:17:59:31 | ContinueExpr | test.rs:53:13:60:13 | LoopExpr |
+| test.rs:69:21:69:28 | ContinueExpr | test.rs:67:13:74:13 | LoopExpr |
+| test.rs:71:21:71:34 | ContinueExpr | test.rs:67:13:74:13 | LoopExpr |
+| test.rs:73:17:73:30 | ContinueExpr | test.rs:67:13:74:13 | LoopExpr |
diff --git a/rust/ql/test/library-tests/controlflow/options b/rust/ql/test/library-tests/controlflow/options
new file mode 100644
index 00000000000..cf148dd35f8
--- /dev/null
+++ b/rust/ql/test/library-tests/controlflow/options
@@ -0,0 +1 @@
+qltest_cargo_check: false
diff --git a/rust/ql/test/library-tests/controlflow/test.rs b/rust/ql/test/library-tests/controlflow/test.rs
index 674c697f715..1de079eaa3b 100644
--- a/rust/ql/test/library-tests/controlflow/test.rs
+++ b/rust/ql/test/library-tests/controlflow/test.rs
@@ -1,6 +1,16 @@
-fn test_call() -> bool {
-    test_and_operator(true, false, true);
-    foo::<u32, u64>(42);
+use std::collections::HashMap;
+use std::convert::Infallible;
+
+mod calls {
+    fn function_call() {
+        test_and_operator(true, false, true);
+        foo::<u32, u64>(42);
+    }
+
+    fn method_call() {
+        let mut map = HashMap::new();
+        map.insert(37, "a");
+    }
 }
 
 mod loop_expression {
@@ -93,6 +103,12 @@ mod loop_expression {
             1;
         }
     }
+
+    fn break_with_return() -> i64 {
+        loop {
+            break return 1;
+        }
+    }
 }
 
 fn test_nested_function(n: i64) -> i64 {
@@ -282,6 +298,61 @@ mod match_expression {
             Option::None => 5,
         }
     }
+
+    fn test_match_and(cond: bool, r: Opton<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>) {
+        let Some(n) = a else { "Expected some" };
+        n
+    }
+
+    fn test_let_with_return(m: Option<i64>) {
+        let ret = match m {
+            Some(ret) => ret,
+            None => return false,
+        };
+        true
+    }
+}
+
+mod patterns {
+
+    fn empty_tuple_pattern(unit: ()) -> void {
+        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 {
@@ -291,11 +362,6 @@ mod divergence {
         }
         "never reached"
     }
-
-    fn test_let_match(a: Option<i64>) {
-        let Some(n) = a else { "Expected some" };
-        n
-    }
 }
 
 fn dead_code() -> i64 {
@@ -337,3 +403,7 @@ fn test_nested_function() {
     }
     nested(&mut x);
 }
+
+trait MyFrom<T> {
+    fn my_from(x: T) -> Self;
+}
diff --git a/rust/ql/test/library-tests/dataflow/barrier/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/library-tests/dataflow/barrier/CONSISTENCY/DataFlowConsistency.expected
new file mode 100644
index 00000000000..da2bb14dcc4
--- /dev/null
+++ b/rust/ql/test/library-tests/dataflow/barrier/CONSISTENCY/DataFlowConsistency.expected
@@ -0,0 +1,15 @@
+uniqueEnclosingCallable
+| main.rs:5:9:5:15 | Param | Node should have one enclosing callable but has 0. |
+| main.rs:9:13:9:19 | Param | Node should have one enclosing callable but has 0. |
+uniqueCallEnclosingCallable
+| main.rs:6:14:6:20 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:17:13:17:20 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:18:5:18:11 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:22:13:22:20 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:23:13:23:23 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:24:5:24:11 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:28:13:28:20 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:29:5:29:11 | CallExpr | Call should have one enclosing callable but has 0. |
+uniqueType
+| main.rs:5:9:5:15 | Param | Node should have one type but has 0. |
+| main.rs:9:13:9:19 | Param | Node should have one type but has 0. |
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/main.rs b/rust/ql/test/library-tests/dataflow/barrier/main.rs
new file mode 100644
index 00000000000..c80233d766f
--- /dev/null
+++ b/rust/ql/test/library-tests/dataflow/barrier/main.rs
@@ -0,0 +1,30 @@
+fn source() -> &'static str {
+    "source"
+}
+
+fn sink(s: &str) {
+    println!("{}", s);
+}
+
+fn sanitize(s: &str) -> &str {
+    match s {
+        "dangerous" => "",
+        s => s
+    }
+}
+
+fn no_barrier() {
+    let s = source();
+    sink(s);
+}
+
+fn with_barrier() {
+    let s = source();
+    let s = sanitize(s);
+    sink(s);
+}
+
+fn main() {
+    let s = source();
+    sink(s);
+}
diff --git a/rust/ql/test/library-tests/dataflow/local/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/library-tests/dataflow/local/CONSISTENCY/DataFlowConsistency.expected
new file mode 100644
index 00000000000..eb84eb428c4
--- /dev/null
+++ b/rust/ql/test/library-tests/dataflow/local/CONSISTENCY/DataFlowConsistency.expected
@@ -0,0 +1,3 @@
+uniqueCallEnclosingCallable
+| main.rs:3:14:3:33 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:7:5:7:14 | CallExpr | Call should have one enclosing callable but has 0. |
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..e69de29bb2d
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/main.rs b/rust/ql/test/library-tests/dataflow/local/main.rs
new file mode 100644
index 00000000000..6aeef95379a
--- /dev/null
+++ b/rust/ql/test/library-tests/dataflow/local/main.rs
@@ -0,0 +1,8 @@
+fn variable() {
+    let s = "Hello";
+    println!("{:?} data flow!", s);
+}
+
+fn main() {
+    variable();
+}
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..54311ff822f
--- /dev/null
+++ b/rust/ql/test/library-tests/definitions/CONSISTENCY/DataFlowConsistency.expected
@@ -0,0 +1,9 @@
+uniqueCallEnclosingCallable
+| main.rs:5:14:5:61 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:6:14:6:56 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:7:14:7:40 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:9:14:9:30 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:10:14:10:34 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:11:5:11:60 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:11:24:11:42 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:11:24:11:42 | CallExpr | Call 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..5115c7118fa
--- /dev/null
+++ b/rust/ql/test/library-tests/formatstrings/CONSISTENCY/DataFlowConsistency.expected
@@ -0,0 +1,69 @@
+uniqueCallEnclosingCallable
+| main.rs:5:14:5:61 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:6:14:6:56 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:7:14:7:40 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:10:14:10:20 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:11:14:11:34 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:12:14:12:34 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:13:14:13:27 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:14:14:14:33 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:16:14:16:30 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:17:14:17:26 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:18:14:18:24 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:19:14:19:32 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:21:14:21:34 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:22:14:22:31 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:23:14:23:35 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:24:14:24:36 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:25:14:25:47 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:27:14:27:36 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:28:5:28:60 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:28:24:28:42 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:28:24:28:42 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:29:5:29:61 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:29:24:29:43 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:29:24:29:43 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:30:5:30:60 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:30:24:30:42 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:30:24:30:42 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:31:5:31:60 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:31:24:31:42 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:31:24:31:42 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:32:14:32:57 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:32:39:32:56 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:32:39:32:56 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:32:47:32:56 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:33:5:33:54 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:33:24:33:39 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:33:24:33:39 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:34:5:34:46 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:34:24:34:35 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:34:24:34:35 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:35:5:35:58 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:35:24:35:40 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:35:24:35:40 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:36:5:36:59 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:36:24:36:41 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:36:24:36:41 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:37:5:37:55 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:37:24:37:38 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:37:24:37:38 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:39:14:39:45 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:41:14:41:49 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:43:14:43:49 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:45:14:45:46 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:47:14:47:48 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:48:14:48:47 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:49:14:49:72 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:52:9:55:22 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:58:9:61:24 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:64:9:67:24 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:70:12:70:31 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:71:12:71:31 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:73:14:73:35 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:75:5:75:49 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:75:24:75:35 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:75:24:75:35 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:76:5:76:46 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:76:24:76:33 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:76:24:76:33 | CallExpr | Call 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/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/library-tests/variables/CONSISTENCY/DataFlowConsistency.expected
new file mode 100644
index 00000000000..7e5ac7d81bc
--- /dev/null
+++ b/rust/ql/test/library-tests/variables/CONSISTENCY/DataFlowConsistency.expected
@@ -0,0 +1,175 @@
+uniqueEnclosingCallable
+| variables.rs:3:14:3:20 | Param | Node should have one enclosing callable but has 0. |
+| variables.rs:7:14:7:19 | Param | Node should have one enclosing callable but has 0. |
+| variables.rs:11:18:11:24 | Param | Node should have one enclosing callable but has 0. |
+| variables.rs:261:5:261:12 | Param | Node should have one enclosing callable but has 0. |
+| variables.rs:262:5:265:19 | Param | Node should have one enclosing callable but has 0. |
+| variables.rs:272:5:272:50 | Param | Node should have one enclosing callable but has 0. |
+| variables.rs:316:10:316:15 | Param | Node should have one enclosing callable but has 0. |
+| variables.rs:324:10:324:15 | Param | Node should have one enclosing callable but has 0. |
+| variables.rs:356:17:356:28 | Param | Node should have one enclosing callable but has 0. |
+| variables.rs:363:22:363:36 | Param | Node should have one enclosing callable but has 0. |
+| variables.rs:363:39:363:57 | Param | Node should have one enclosing callable but has 0. |
+| variables.rs:435:8:435:15 | Param | Node should have one enclosing callable but has 0. |
+| variables.rs:451:13:451:21 | Param | Node should have one enclosing callable but has 0. |
+| variables.rs:451:24:451:32 | Param | Node should have one enclosing callable but has 0. |
+uniqueCallEnclosingCallable
+| variables.rs:4:14:4:20 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:8:14:8:20 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:12:5:12:17 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:17:5:17:17 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:22:5:22:17 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:24:5:24:17 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:29:5:29:21 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:31:5:31:21 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:36:5:36:17 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:39:5:39:17 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:44:5:44:17 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:47:9:47:21 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:49:5:49:17 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:68:5:68:17 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:69:5:69:17 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:70:5:70:16 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:71:5:71:16 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:80:5:80:17 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:81:5:81:17 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:85:14:85:41 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:85:19:85:40 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:89:9:89:21 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:94:34:94:43 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:96:13:96:19 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:98:5:98:17 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:102:14:102:41 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:102:19:102:40 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:106:9:106:21 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:111:14:111:20 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:115:21:115:39 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:119:13:119:25 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:121:17:121:33 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:124:5:124:17 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:136:13:136:28 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:137:13:137:28 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:138:13:138:28 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:148:13:148:28 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:149:13:149:27 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:160:14:160:26 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:174:14:174:35 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:176:22:176:51 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:179:13:179:25 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:189:18:189:33 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:192:16:192:28 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:203:14:203:36 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:206:16:206:28 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:210:16:210:28 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:214:16:214:28 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:219:18:219:33 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:223:16:223:28 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:229:18:229:33 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:235:13:235:26 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:238:17:238:31 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:253:14:253:35 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:256:16:256:29 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:266:5:266:17 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:267:5:267:17 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:268:5:268:17 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:274:5:274:17 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:283:5:283:18 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:284:5:284:17 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:285:5:285:17 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:296:5:296:18 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:297:5:297:17 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:298:5:298:17 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:305:13:305:26 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:306:13:306:25 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:310:5:310:18 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:311:5:311:17 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:319:9:319:26 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:320:5:320:17 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:322:5:322:24 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:327:9:327:29 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:328:5:328:17 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:336:9:336:23 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:343:5:343:16 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:345:5:345:16 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:353:5:353:16 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:374:9:374:28 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:377:5:377:16 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:382:5:385:5 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:388:5:388:16 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:396:5:396:16 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:403:9:403:20 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:405:5:405:9 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:406:5:406:16 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:413:9:413:20 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:415:5:415:14 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:416:5:416:16 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:423:5:423:14 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:424:5:424:16 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:431:5:431:14 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:432:5:432:16 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:437:5:437:16 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:438:5:438:20 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:441:9:441:20 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:442:9:442:24 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:445:9:445:20 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:446:9:446:24 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:448:5:448:16 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:454:9:454:20 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:456:9:456:20 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:460:9:460:20 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:462:9:462:20 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:479:5:479:25 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:481:5:481:25 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:483:5:483:25 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:488:5:488:21 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:489:5:489:16 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:492:5:492:21 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:509:3:509:18 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:513:5:513:24 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:514:5:514:22 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:515:5:515:39 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:516:5:516:22 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:517:5:517:22 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:518:5:518:18 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:519:5:519:18 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:520:5:520:18 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:521:5:521:18 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:522:5:522:20 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:523:5:523:20 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:524:5:524:20 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:525:5:525:20 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:526:5:526:20 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:527:5:527:20 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:528:5:528:20 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:529:5:529:20 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:530:5:530:20 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:531:5:531:35 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:532:5:532:36 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:532:20:532:35 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:533:5:533:25 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:534:5:534:22 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:535:5:535:18 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:536:5:536:16 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:537:5:537:12 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:538:5:538:16 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:539:5:539:11 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:540:5:540:17 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:541:5:541:19 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:542:5:542:13 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:543:5:543:13 | CallExpr | Call should have one enclosing callable but has 0. |
+| variables.rs:544:5:544:29 | CallExpr | Call should have one enclosing callable but has 0. |
+uniqueType
+| variables.rs:3:14:3:20 | Param | Node should have one type but has 0. |
+| variables.rs:7:14:7:19 | Param | Node should have one type but has 0. |
+| variables.rs:11:18:11:24 | Param | Node should have one type but has 0. |
+| variables.rs:261:5:261:12 | Param | Node should have one type but has 0. |
+| variables.rs:262:5:265:19 | Param | Node should have one type but has 0. |
+| variables.rs:272:5:272:50 | Param | Node should have one type but has 0. |
+| variables.rs:316:10:316:15 | Param | Node should have one type but has 0. |
+| variables.rs:324:10:324:15 | Param | Node should have one type but has 0. |
+| variables.rs:356:17:356:28 | Param | Node should have one type but has 0. |
+| variables.rs:363:22:363:36 | Param | Node should have one type but has 0. |
+| variables.rs:363:39:363:57 | Param | Node should have one type but has 0. |
+| variables.rs:435:8:435:15 | Param | Node should have one type but has 0. |
+| variables.rs:451:13:451:21 | Param | Node should have one type but has 0. |
+| variables.rs:451:24:451:32 | Param | Node should have one type but has 0. |
diff --git a/rust/ql/test/library-tests/variables/Cfg.expected b/rust/ql/test/library-tests/variables/Cfg.expected
index 1c04117a2cc..f9bd2363019 100644
--- a/rust/ql/test/library-tests/variables/Cfg.expected
+++ b/rust/ql/test/library-tests/variables/Cfg.expected
@@ -31,1149 +31,1208 @@ edges
 | 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:14:1 | enter immutable_variable | variables.rs:12:5:12:17 | LetStmt |  |
-| variables.rs:11:1:14:1 | exit immutable_variable (normal) | variables.rs:11:1:14:1 | exit immutable_variable |  |
-| variables.rs:11:25:14:1 | BlockExpr | variables.rs:11:1:14:1 | exit immutable_variable (normal) |  |
-| variables.rs:12:5:12:17 | LetStmt | variables.rs:12:14:12:16 | "a" |  |
-| variables.rs:12:9:12:10 | x1 | variables.rs:13:5:13:18 | ExprStmt | match |
-| variables.rs:12:14:12:16 | "a" | variables.rs:12:9:12:10 | x1 |  |
-| variables.rs:13:5:13:13 | PathExpr | variables.rs:13:15:13:16 | x1 |  |
-| variables.rs:13:5:13:17 | CallExpr | variables.rs:11:25:14:1 | BlockExpr |  |
-| variables.rs:13:5:13:18 | ExprStmt | variables.rs:13:5:13:13 | PathExpr |  |
-| variables.rs:13:15:13:16 | x1 | variables.rs:13:5:13:17 | CallExpr |  |
-| variables.rs:16:1:21:1 | enter mutable_variable | variables.rs:17:5:17:19 | LetStmt |  |
-| variables.rs:16:1:21:1 | exit mutable_variable (normal) | variables.rs:16:1:21:1 | exit mutable_variable |  |
-| variables.rs:16:23:21:1 | BlockExpr | variables.rs:16:1:21:1 | exit mutable_variable (normal) |  |
-| variables.rs:17:5:17:19 | LetStmt | variables.rs:17:18:17:18 | 4 |  |
-| variables.rs:17:9:17:14 | x2 | variables.rs:18:5:18:18 | ExprStmt | match |
-| variables.rs:17:18:17:18 | 4 | variables.rs:17:9:17:14 | x2 |  |
-| variables.rs:18:5:18:13 | PathExpr | variables.rs:18:15:18:16 | x2 |  |
-| variables.rs:18:5:18:17 | CallExpr | variables.rs:19:5:19:11 | ExprStmt |  |
-| variables.rs:18:5:18:18 | ExprStmt | variables.rs:18:5:18:13 | PathExpr |  |
-| variables.rs:18:15:18:16 | x2 | variables.rs:18:5:18:17 | CallExpr |  |
-| variables.rs:19:5:19:6 | x2 | variables.rs:19:10:19:10 | 5 |  |
-| variables.rs:19:5:19:10 | ... = ... | variables.rs:20:5:20:18 | ExprStmt |  |
-| variables.rs:19:5:19:11 | ExprStmt | variables.rs:19:5:19:6 | x2 |  |
-| variables.rs:19:10:19:10 | 5 | variables.rs:19:5:19:10 | ... = ... |  |
-| variables.rs:20:5:20:13 | PathExpr | variables.rs:20:15:20:16 | x2 |  |
-| variables.rs:20:5:20:17 | CallExpr | variables.rs:16:23:21:1 | BlockExpr |  |
-| variables.rs:20:5:20:18 | ExprStmt | variables.rs:20:5:20:13 | PathExpr |  |
-| variables.rs:20:15:20:16 | x2 | variables.rs:20:5:20:17 | CallExpr |  |
-| variables.rs:23:1:29:1 | enter variable_shadow1 | variables.rs:24:5:24:15 | LetStmt |  |
-| variables.rs:23:1:29:1 | exit variable_shadow1 (normal) | variables.rs:23:1:29:1 | exit variable_shadow1 |  |
-| variables.rs:23:23:29:1 | BlockExpr | variables.rs:23:1:29:1 | exit variable_shadow1 (normal) |  |
-| variables.rs:24:5:24:15 | LetStmt | variables.rs:24:14:24:14 | 1 |  |
-| variables.rs:24:9:24:10 | x3 | variables.rs:25:5:25:18 | ExprStmt | match |
-| variables.rs:24:14:24:14 | 1 | variables.rs:24:9:24:10 | x3 |  |
-| variables.rs:25:5:25:13 | PathExpr | variables.rs:25:15:25:16 | x3 |  |
-| variables.rs:25:5:25:17 | CallExpr | variables.rs:26:5:27:15 | LetStmt |  |
-| variables.rs:25:5:25:18 | ExprStmt | variables.rs:25:5:25:13 | PathExpr |  |
-| variables.rs:25:15:25:16 | x3 | variables.rs:25:5:25:17 | CallExpr |  |
-| variables.rs:26:5:27:15 | LetStmt | variables.rs:27:9:27:10 | x3 |  |
-| variables.rs:26:9:26:10 | x3 | variables.rs:28:5:28:18 | ExprStmt | match |
-| variables.rs:27:9:27:10 | x3 | variables.rs:27:14:27:14 | 1 |  |
-| variables.rs:27:9:27:14 | ... + ... | variables.rs:26:9:26:10 | x3 |  |
-| variables.rs:27:14:27:14 | 1 | variables.rs:27:9:27:14 | ... + ... |  |
-| variables.rs:28:5:28:13 | PathExpr | variables.rs:28:15:28:16 | x3 |  |
-| variables.rs:28:5:28:17 | CallExpr | variables.rs:23:23:29:1 | BlockExpr |  |
-| variables.rs:28:5:28:18 | ExprStmt | variables.rs:28:5:28:13 | PathExpr |  |
-| variables.rs:28:15:28:16 | x3 | variables.rs:28:5:28:17 | CallExpr |  |
-| variables.rs:31:1:39:1 | enter variable_shadow2 | variables.rs:32:5:32:17 | LetStmt |  |
-| variables.rs:31:1:39:1 | exit variable_shadow2 (normal) | variables.rs:31:1:39:1 | exit variable_shadow2 |  |
-| variables.rs:31:23:39:1 | BlockExpr | variables.rs:31:1:39:1 | exit variable_shadow2 (normal) |  |
-| variables.rs:32:5:32:17 | LetStmt | variables.rs:32:14:32:16 | "a" |  |
-| variables.rs:32:9:32:10 | x4 | variables.rs:33:5:33:18 | ExprStmt | match |
-| variables.rs:32:14:32:16 | "a" | variables.rs:32:9:32:10 | x4 |  |
-| variables.rs:33:5:33:13 | PathExpr | variables.rs:33:15:33:16 | x4 |  |
-| variables.rs:33:5:33:17 | CallExpr | variables.rs:34:5:37:5 | ExprStmt |  |
-| variables.rs:33:5:33:18 | ExprStmt | variables.rs:33:5:33:13 | PathExpr |  |
-| variables.rs:33:15:33:16 | x4 | variables.rs:33:5:33:17 | CallExpr |  |
-| variables.rs:34:5:37:5 | BlockExpr | variables.rs:38:5:38:18 | ExprStmt |  |
-| variables.rs:34:5:37:5 | ExprStmt | variables.rs:35:9:35:21 | LetStmt |  |
-| variables.rs:35:9:35:21 | LetStmt | variables.rs:35:18:35:20 | "b" |  |
-| variables.rs:35:13:35:14 | x4 | variables.rs:36:9:36:22 | ExprStmt | match |
-| variables.rs:35:18:35:20 | "b" | variables.rs:35:13:35:14 | x4 |  |
-| variables.rs:36:9:36:17 | PathExpr | variables.rs:36:19:36:20 | x4 |  |
-| variables.rs:36:9:36:21 | CallExpr | variables.rs:34:5:37:5 | BlockExpr |  |
-| variables.rs:36:9:36:22 | ExprStmt | variables.rs:36:9:36:17 | PathExpr |  |
-| variables.rs:36:19:36:20 | x4 | variables.rs:36:9:36:21 | CallExpr |  |
-| variables.rs:38:5:38:13 | PathExpr | variables.rs:38:15:38:16 | x4 |  |
-| variables.rs:38:5:38:17 | CallExpr | variables.rs:31:23:39:1 | BlockExpr |  |
-| variables.rs:38:5:38:18 | ExprStmt | variables.rs:38:5:38:13 | PathExpr |  |
-| variables.rs:38:15:38:16 | x4 | variables.rs:38:5:38:17 | CallExpr |  |
-| variables.rs:46:1:61:1 | enter let_pattern1 | variables.rs:47:5:56:47 | LetStmt |  |
-| variables.rs:46:1:61:1 | exit let_pattern1 (normal) | variables.rs:46:1:61:1 | exit let_pattern1 |  |
-| variables.rs:46:19:61:1 | BlockExpr | variables.rs:46:1:61:1 | exit let_pattern1 (normal) |  |
-| variables.rs:47:5:56:47 | LetStmt | variables.rs:56:11:56:13 | "a" |  |
-| variables.rs:47:9:56:5 | TuplePat | variables.rs:48:9:51:9 | TuplePat | match |
-| variables.rs:48:9:51:9 | TuplePat | variables.rs:49:13:49:14 | a1 | match |
-| variables.rs:49:13:49:14 | a1 | variables.rs:50:13:50:14 | b1 | match |
-| variables.rs:50:13:50:14 | b1 | variables.rs:52:9:55:9 | RecordPat | match |
-| variables.rs:52:9:55:9 | RecordPat | variables.rs:53:13:53:13 | x | match |
-| variables.rs:53:13:53:13 | x | variables.rs:54:13:54:13 | y | match |
-| variables.rs:54:13:54:13 | y | variables.rs:57:5:57:18 | ExprStmt | match |
-| variables.rs:56:9:56:46 | TupleExpr | variables.rs:47:9:56:5 | TuplePat |  |
-| variables.rs:56:10:56:19 | TupleExpr | variables.rs:56:33:56:35 | "x" |  |
-| variables.rs:56:11:56:13 | "a" | variables.rs:56:16:56:18 | "b" |  |
-| variables.rs:56:16:56:18 | "b" | variables.rs:56:10:56:19 | TupleExpr |  |
-| variables.rs:56:22:56:45 | RecordExpr | variables.rs:56:9:56:46 | TupleExpr |  |
-| variables.rs:56:33:56:35 | "x" | variables.rs:56:41:56:43 | "y" |  |
-| variables.rs:56:41:56:43 | "y" | variables.rs:56:22:56:45 | RecordExpr |  |
-| variables.rs:57:5:57:13 | PathExpr | variables.rs:57:15:57:16 | a1 |  |
-| variables.rs:57:5:57:17 | CallExpr | variables.rs:58:5:58:18 | ExprStmt |  |
-| variables.rs:57:5:57:18 | ExprStmt | variables.rs:57:5:57:13 | PathExpr |  |
-| variables.rs:57:15:57:16 | a1 | variables.rs:57:5:57:17 | CallExpr |  |
-| variables.rs:58:5:58:13 | PathExpr | variables.rs:58:15:58:16 | b1 |  |
-| variables.rs:58:5:58:17 | CallExpr | variables.rs:59:5:59:17 | ExprStmt |  |
-| variables.rs:58:5:58:18 | ExprStmt | variables.rs:58:5:58:13 | PathExpr |  |
-| variables.rs:58:15:58:16 | b1 | variables.rs:58:5:58:17 | CallExpr |  |
-| variables.rs:59:5:59:13 | PathExpr | variables.rs:59:15:59:15 | x |  |
-| variables.rs:59:5:59:16 | CallExpr | variables.rs:60:5:60:17 | ExprStmt |  |
-| variables.rs:59:5:59:17 | ExprStmt | variables.rs:59:5:59:13 | PathExpr |  |
-| variables.rs:59:15:59:15 | x | variables.rs:59:5:59:16 | CallExpr |  |
-| variables.rs:60:5:60:13 | PathExpr | variables.rs:60:15:60:15 | y |  |
-| variables.rs:60:5:60:16 | CallExpr | variables.rs:46:19:61:1 | BlockExpr |  |
-| variables.rs:60:5:60:17 | ExprStmt | variables.rs:60:5:60:13 | PathExpr |  |
-| variables.rs:60:15:60:15 | y | variables.rs:60:5:60:16 | CallExpr |  |
-| variables.rs:63:1:71:1 | enter let_pattern2 | variables.rs:64:5:64:38 | LetStmt |  |
-| variables.rs:63:1:71:1 | exit let_pattern2 (normal) | variables.rs:63:1:71:1 | exit let_pattern2 |  |
-| variables.rs:63:19:71:1 | BlockExpr | variables.rs:63:1:71:1 | exit let_pattern2 (normal) |  |
-| variables.rs:64:5:64:38 | LetStmt | variables.rs:64:25:64:27 | "a" |  |
-| variables.rs:64:9:64:10 | p1 | variables.rs:65:5:68:11 | LetStmt | match |
-| variables.rs:64:14:64:37 | RecordExpr | variables.rs:64:9:64:10 | p1 |  |
-| variables.rs:64:25:64:27 | "a" | variables.rs:64:33:64:35 | "b" |  |
-| variables.rs:64:33:64:35 | "b" | variables.rs:64:14:64:37 | RecordExpr |  |
-| variables.rs:65:5:68:11 | LetStmt | variables.rs:68:9:68:10 | p1 |  |
-| variables.rs:65:9:68:5 | RecordPat | variables.rs:66:12:66:13 | a2 | match |
-| variables.rs:66:12:66:13 | a2 | variables.rs:67:12:67:13 | b2 | match |
-| variables.rs:67:12:67:13 | b2 | variables.rs:69:5:69:18 | ExprStmt | match |
-| variables.rs:68:9:68:10 | p1 | variables.rs:65:9:68:5 | RecordPat |  |
-| variables.rs:69:5:69:13 | PathExpr | variables.rs:69:15:69:16 | a2 |  |
-| variables.rs:69:5:69:17 | CallExpr | variables.rs:70:5:70:18 | ExprStmt |  |
+| 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 | PathExpr |  |
+| variables.rs:11:27:13:1 | BlockExpr | variables.rs:11:1:13:1 | exit print_i64_ref (normal) |  |
+| variables.rs:12:5:12:13 | PathExpr | 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 | PathExpr | 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 | PathExpr |  |
+| 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 | PathExpr | 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 | PathExpr |  |
+| 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 | PathExpr | 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 | PathExpr |  |
+| 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 | PathExpr | 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 | PathExpr |  |
+| 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 | PathExpr | 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 | PathExpr |  |
+| 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 | PathExpr | 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 | PathExpr |  |
+| 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 | PathExpr | 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 | PathExpr |  |
+| 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 | PathExpr | 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 | PathExpr |  |
+| 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 | PathExpr | 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 | PathExpr |  |
+| variables.rs:47:19:47:20 | x4 | variables.rs:47:9:47:21 | CallExpr |  |
+| variables.rs:49:5:49:13 | PathExpr | 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 | PathExpr |  |
+| 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 | PathExpr | 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 | PathExpr |  |
+| variables.rs:68:15:68:16 | a1 | variables.rs:68:5:68:17 | CallExpr |  |
+| variables.rs:69:5:69:13 | PathExpr | 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 | PathExpr |  |
-| variables.rs:69:15:69:16 | a2 | variables.rs:69:5:69:17 | CallExpr |  |
-| variables.rs:70:5:70:13 | PathExpr | variables.rs:70:15:70:16 | b2 |  |
-| variables.rs:70:5:70:17 | CallExpr | variables.rs:63:19:71:1 | BlockExpr |  |
-| variables.rs:70:5:70:18 | ExprStmt | variables.rs:70:5:70:13 | PathExpr |  |
-| variables.rs:70:15:70:16 | b2 | variables.rs:70:5:70:17 | CallExpr |  |
-| variables.rs:73:1:80:1 | enter let_pattern3 | variables.rs:74:5:74:42 | LetStmt |  |
-| variables.rs:73:1:80:1 | exit let_pattern3 (normal) | variables.rs:73:1:80:1 | exit let_pattern3 |  |
-| variables.rs:73:19:80:1 | BlockExpr | variables.rs:73:1:80:1 | exit let_pattern3 (normal) |  |
-| variables.rs:74:5:74:42 | LetStmt | variables.rs:74:14:74:17 | PathExpr |  |
-| variables.rs:74:9:74:10 | s1 | variables.rs:76:8:77:12 | LetExpr | match |
-| variables.rs:74:14:74:17 | PathExpr | variables.rs:74:19:74:30 | PathExpr |  |
-| variables.rs:74:14:74:41 | CallExpr | variables.rs:74:9:74:10 | s1 |  |
-| variables.rs:74:19:74:30 | PathExpr | variables.rs:74:32:74:39 | "Hello!" |  |
-| variables.rs:74:19:74:40 | CallExpr | variables.rs:74:14:74:41 | CallExpr |  |
-| variables.rs:74:32:74:39 | "Hello!" | variables.rs:74:19:74:40 | CallExpr |  |
-| variables.rs:76:5:79:5 | IfExpr | variables.rs:73:19:80:1 | BlockExpr |  |
-| variables.rs:76:8:77:12 | LetExpr | variables.rs:77:11:77:12 | s1 |  |
-| variables.rs:76:12:76:23 | TupleStructPat | variables.rs:76:5:79:5 | IfExpr | no-match |
-| variables.rs:76:12:76:23 | TupleStructPat | variables.rs:76:17:76:22 | s2 | match |
-| variables.rs:76:17:76:22 | s2 | variables.rs:78:9:78:22 | ExprStmt | match |
-| variables.rs:77:11:77:12 | s1 | variables.rs:76:12:76:23 | TupleStructPat |  |
-| variables.rs:77:14:79:5 | BlockExpr | variables.rs:76:5:79:5 | IfExpr |  |
-| variables.rs:78:9:78:17 | PathExpr | variables.rs:78:19:78:20 | s2 |  |
-| variables.rs:78:9:78:21 | CallExpr | variables.rs:77:14:79:5 | BlockExpr |  |
-| variables.rs:78:9:78:22 | ExprStmt | variables.rs:78:9:78:17 | PathExpr |  |
-| variables.rs:78:19:78:20 | s2 | variables.rs:78:9:78:21 | CallExpr |  |
-| variables.rs:82:1:88:1 | enter let_pattern4 | variables.rs:83:5:86:10 | LetStmt |  |
-| variables.rs:82:1:88:1 | exit let_pattern4 (normal) | variables.rs:82:1:88:1 | exit let_pattern4 |  |
-| variables.rs:82:19:88:1 | BlockExpr | variables.rs:82:1:88:1 | exit let_pattern4 (normal) |  |
-| variables.rs:83:5:86:10 | LetStmt | variables.rs:83:34:83:37 | PathExpr |  |
-| variables.rs:83:9:83:16 | TupleStructPat | variables.rs:83:14:83:15 | x5 | match |
-| variables.rs:83:9:83:16 | TupleStructPat | variables.rs:85:13:85:19 | MacroStmts | no-match |
-| variables.rs:83:14:83:15 | x5 | variables.rs:87:5:87:18 | ExprStmt | match |
-| variables.rs:83:34:83:37 | PathExpr | variables.rs:83:39:83:42 | "x5" |  |
-| variables.rs:83:34:83:43 | CallExpr | variables.rs:83:9:83:16 | TupleStructPat |  |
-| variables.rs:83:39:83:42 | "x5" | variables.rs:83:34:83:43 | CallExpr |  |
-| variables.rs:85:13:85:19 | "not yet implemented" | variables.rs:85:13:85:19 | CallExpr |  |
-| variables.rs:85:13:85:19 | CallExpr | variables.rs:85:13:85:19 | MacroExpr |  |
-| variables.rs:85:13:85:19 | MacroExpr | variables.rs:84:14:86:9 | BlockExpr |  |
-| variables.rs:85:13:85:19 | MacroStmts | variables.rs:85:13:85:19 | PathExpr |  |
-| variables.rs:85:13:85:19 | PathExpr | variables.rs:85:13:85:19 | "not yet implemented" |  |
-| variables.rs:87:5:87:13 | PathExpr | variables.rs:87:15:87:16 | x5 |  |
-| variables.rs:87:5:87:17 | CallExpr | variables.rs:82:19:88:1 | BlockExpr |  |
-| variables.rs:87:5:87:18 | ExprStmt | variables.rs:87:5:87:13 | PathExpr |  |
-| variables.rs:87:15:87:16 | x5 | variables.rs:87:5:87:17 | CallExpr |  |
-| variables.rs:90:1:97:1 | enter let_pattern5 | variables.rs:91:5:91:42 | LetStmt |  |
-| variables.rs:90:1:97:1 | exit let_pattern5 (normal) | variables.rs:90:1:97:1 | exit let_pattern5 |  |
-| variables.rs:90:19:97:1 | BlockExpr | variables.rs:90:1:97:1 | exit let_pattern5 (normal) |  |
-| variables.rs:91:5:91:42 | LetStmt | variables.rs:91:14:91:17 | PathExpr |  |
-| variables.rs:91:9:91:10 | s1 | variables.rs:93:11:94:12 | LetExpr | match |
-| variables.rs:91:14:91:17 | PathExpr | variables.rs:91:19:91:30 | PathExpr |  |
-| variables.rs:91:14:91:41 | CallExpr | variables.rs:91:9:91:10 | s1 |  |
-| variables.rs:91:19:91:30 | PathExpr | variables.rs:91:32:91:39 | "Hello!" |  |
-| variables.rs:91:19:91:40 | CallExpr | variables.rs:91:14:91:41 | CallExpr |  |
-| variables.rs:91:32:91:39 | "Hello!" | variables.rs:91:19:91:40 | CallExpr |  |
-| variables.rs:93:5:96:5 | WhileExpr | variables.rs:90:19:97:1 | BlockExpr |  |
-| variables.rs:93:11:94:12 | LetExpr | variables.rs:94:11:94:12 | s1 |  |
-| variables.rs:93:15:93:26 | TupleStructPat | variables.rs:93:5:96:5 | WhileExpr | no-match |
-| variables.rs:93:15:93:26 | TupleStructPat | variables.rs:93:20:93:25 | s2 | match |
-| variables.rs:93:20:93:25 | s2 | variables.rs:95:9:95:22 | ExprStmt | match |
-| variables.rs:94:11:94:12 | s1 | variables.rs:93:15:93:26 | TupleStructPat |  |
-| variables.rs:94:14:96:5 | BlockExpr | variables.rs:93:11:94:12 | LetExpr |  |
-| variables.rs:95:9:95:17 | PathExpr | variables.rs:95:19:95:20 | s2 |  |
-| variables.rs:95:9:95:21 | CallExpr | variables.rs:94:14:96:5 | BlockExpr |  |
-| variables.rs:95:9:95:22 | ExprStmt | variables.rs:95:9:95:17 | PathExpr |  |
-| variables.rs:95:19:95:20 | s2 | variables.rs:95:9:95:21 | CallExpr |  |
-| variables.rs:99:1:114:1 | enter match_pattern1 | variables.rs:100:5:100:21 | LetStmt |  |
-| variables.rs:99:1:114:1 | exit match_pattern1 (normal) | variables.rs:99:1:114:1 | exit match_pattern1 |  |
-| variables.rs:99:21:114:1 | BlockExpr | variables.rs:99:1:114:1 | exit match_pattern1 (normal) |  |
-| variables.rs:100:5:100:21 | LetStmt | variables.rs:100:14:100:17 | PathExpr |  |
-| variables.rs:100:9:100:10 | x6 | variables.rs:101:5:101:16 | LetStmt | match |
-| variables.rs:100:14:100:17 | PathExpr | variables.rs:100:19:100:19 | 5 |  |
-| variables.rs:100:14:100:20 | CallExpr | variables.rs:100:9:100:10 | x6 |  |
-| variables.rs:100:19:100:19 | 5 | variables.rs:100:14:100:20 | CallExpr |  |
-| variables.rs:101:5:101:16 | LetStmt | variables.rs:101:14:101:15 | 10 |  |
-| variables.rs:101:9:101:10 | y1 | variables.rs:103:5:111:5 | ExprStmt | match |
-| variables.rs:101:14:101:15 | 10 | variables.rs:101:9:101:10 | y1 |  |
-| variables.rs:103:5:111:5 | ExprStmt | variables.rs:103:11:103:12 | x6 |  |
-| variables.rs:103:5:111:5 | MatchExpr | variables.rs:113:5:113:18 | ExprStmt |  |
-| variables.rs:103:11:103:12 | x6 | variables.rs:104:9:104:16 | TupleStructPat |  |
-| variables.rs:104:9:104:16 | TupleStructPat | variables.rs:104:14:104:15 | LiteralPat | match |
-| variables.rs:104:9:104:16 | TupleStructPat | variables.rs:105:9:105:16 | TupleStructPat | no-match |
-| variables.rs:104:14:104:15 | LiteralPat | variables.rs:104:21:104:29 | PathExpr | match |
-| variables.rs:104:14:104:15 | LiteralPat | variables.rs:105:9:105:16 | TupleStructPat | no-match |
-| variables.rs:104:21:104:29 | PathExpr | variables.rs:104:31:104:38 | "Got 50" |  |
-| variables.rs:104:21:104:39 | CallExpr | variables.rs:103:5:111:5 | MatchExpr |  |
-| variables.rs:104:31:104:38 | "Got 50" | variables.rs:104:21:104:39 | CallExpr |  |
-| variables.rs:105:9:105:16 | TupleStructPat | variables.rs:105:14:105:15 | y1 | match |
-| variables.rs:105:9:105:16 | TupleStructPat | variables.rs:110:9:110:12 | None | no-match |
-| variables.rs:105:14:105:15 | y1 | variables.rs:108:13:108:21 | PathExpr | match |
-| variables.rs:107:9:109:9 | BlockExpr | variables.rs:103:5:111:5 | MatchExpr |  |
-| variables.rs:108:13:108:21 | PathExpr | variables.rs:108:23:108:24 | y1 |  |
-| variables.rs:108:13:108:25 | CallExpr | variables.rs:107:9:109:9 | BlockExpr |  |
-| variables.rs:108:23:108:24 | y1 | variables.rs:108:13:108:25 | CallExpr |  |
-| variables.rs:110:9:110:12 | None | variables.rs:110:17:110:25 | PathExpr | match |
-| variables.rs:110:17:110:25 | PathExpr | variables.rs:110:27:110:32 | "NONE" |  |
-| variables.rs:110:17:110:33 | CallExpr | variables.rs:103:5:111:5 | MatchExpr |  |
-| variables.rs:110:27:110:32 | "NONE" | variables.rs:110:17:110:33 | CallExpr |  |
-| variables.rs:113:5:113:13 | PathExpr | variables.rs:113:15:113:16 | y1 |  |
-| variables.rs:113:5:113:17 | CallExpr | variables.rs:99:21:114:1 | BlockExpr |  |
-| variables.rs:113:5:113:18 | ExprStmt | variables.rs:113:5:113:13 | PathExpr |  |
-| variables.rs:113:15:113:16 | y1 | variables.rs:113:5:113:17 | CallExpr |  |
-| variables.rs:116:1:141:1 | enter match_pattern2 | variables.rs:117:5:117:36 | LetStmt |  |
-| variables.rs:116:1:141:1 | exit match_pattern2 (normal) | variables.rs:116:1:141:1 | exit match_pattern2 |  |
-| variables.rs:116:21:141:1 | BlockExpr | variables.rs:116:1:141:1 | exit match_pattern2 (normal) |  |
-| variables.rs:117:5:117:36 | LetStmt | variables.rs:117:20:117:20 | 2 |  |
-| variables.rs:117:9:117:15 | numbers | variables.rs:119:5:129:5 | ExprStmt | match |
-| variables.rs:117:19:117:35 | TupleExpr | variables.rs:117:9:117:15 | numbers |  |
-| variables.rs:117:20:117:20 | 2 | variables.rs:117:23:117:23 | 4 |  |
-| variables.rs:117:23:117:23 | 4 | variables.rs:117:26:117:26 | 8 |  |
-| variables.rs:117:26:117:26 | 8 | variables.rs:117:29:117:30 | 16 |  |
-| variables.rs:117:29:117:30 | 16 | variables.rs:117:33:117:34 | 32 |  |
-| variables.rs:117:33:117:34 | 32 | variables.rs:117:19:117:35 | TupleExpr |  |
-| variables.rs:119:5:129:5 | ExprStmt | variables.rs:119:11:119:17 | numbers |  |
-| variables.rs:119:5:129:5 | MatchExpr | variables.rs:131:11:131:17 | numbers |  |
-| variables.rs:119:11:119:17 | numbers | variables.rs:120:9:124:9 | TuplePat |  |
-| variables.rs:120:9:124:9 | TuplePat | variables.rs:121:13:121:17 | first | match |
-| variables.rs:121:13:121:17 | first | variables.rs:121:20:121:20 | WildcardPat | match |
-| variables.rs:121:20:121:20 | WildcardPat | variables.rs:122:13:122:17 | third | match |
-| variables.rs:122:13:122:17 | third | variables.rs:122:20:122:20 | WildcardPat | match |
-| variables.rs:122:20:122:20 | WildcardPat | variables.rs:123:13:123:17 | fifth | match |
-| variables.rs:123:13:123:17 | fifth | variables.rs:125:13:125:29 | ExprStmt | match |
-| variables.rs:124:14:128:9 | BlockExpr | variables.rs:119:5:129:5 | MatchExpr |  |
-| variables.rs:125:13:125:21 | PathExpr | variables.rs:125:23:125:27 | first |  |
-| variables.rs:125:13:125:28 | CallExpr | variables.rs:126:13:126:29 | ExprStmt |  |
-| variables.rs:125:13:125:29 | ExprStmt | variables.rs:125:13:125:21 | PathExpr |  |
-| variables.rs:125:23:125:27 | first | variables.rs:125:13:125:28 | CallExpr |  |
-| variables.rs:126:13:126:21 | PathExpr | variables.rs:126:23:126:27 | third |  |
-| variables.rs:126:13:126:28 | CallExpr | variables.rs:127:13:127:29 | ExprStmt |  |
-| variables.rs:126:13:126:29 | ExprStmt | variables.rs:126:13:126:21 | PathExpr |  |
-| variables.rs:126:23:126:27 | third | variables.rs:126:13:126:28 | CallExpr |  |
-| variables.rs:127:13:127:21 | PathExpr | variables.rs:127:23:127:27 | fifth |  |
-| variables.rs:127:13:127:28 | CallExpr | variables.rs:124:14:128:9 | BlockExpr |  |
-| variables.rs:127:13:127:29 | ExprStmt | variables.rs:127:13:127:21 | PathExpr |  |
-| variables.rs:127:23:127:27 | fifth | variables.rs:127:13:127:28 | CallExpr |  |
-| variables.rs:131:5:140:5 | MatchExpr | variables.rs:116:21:141:1 | BlockExpr |  |
-| variables.rs:131:11:131:17 | numbers | variables.rs:132:9:136:9 | TuplePat |  |
-| variables.rs:132:9:136:9 | TuplePat | variables.rs:133:13:133:17 | first | match |
-| variables.rs:133:13:133:17 | first | variables.rs:134:13:134:14 | RestPat | match |
-| variables.rs:134:13:134:14 | RestPat | variables.rs:135:13:135:16 | last | match |
-| variables.rs:135:13:135:16 | last | variables.rs:137:13:137:29 | ExprStmt | match |
-| variables.rs:136:14:139:9 | BlockExpr | variables.rs:131:5:140:5 | MatchExpr |  |
-| variables.rs:137:13:137:21 | PathExpr | variables.rs:137:23:137:27 | first |  |
-| variables.rs:137:13:137:28 | CallExpr | variables.rs:138:13:138:28 | ExprStmt |  |
+| variables.rs:69:15:69:16 | b1 | variables.rs:69:5:69:17 | CallExpr |  |
+| variables.rs:70:5:70:13 | PathExpr | 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 | PathExpr |  |
+| variables.rs:70:15:70:15 | x | variables.rs:70:5:70:16 | CallExpr |  |
+| variables.rs:71:5:71:13 | PathExpr | 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 | PathExpr |  |
+| 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 | PathExpr | 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 | PathExpr |  |
+| variables.rs:80:15:80:16 | a2 | variables.rs:80:5:80:17 | CallExpr |  |
+| variables.rs:81:5:81:13 | PathExpr | 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 | PathExpr |  |
+| 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 | PathExpr |  |
+| variables.rs:85:9:85:10 | s1 | variables.rs:87:8:88:12 | LetExpr | match |
+| variables.rs:85:14:85:17 | PathExpr | variables.rs:85:19:85:30 | PathExpr |  |
+| variables.rs:85:14:85:41 | CallExpr | variables.rs:85:9:85:10 | s1 |  |
+| variables.rs:85:19:85:30 | PathExpr | 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 | PathExpr | 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 | PathExpr |  |
+| 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 | PathExpr |  |
+| 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 | PathExpr | 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 | 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 | PathExpr |  |
+| variables.rs:96:13:96:19 | PathExpr | variables.rs:96:13:96:19 | "not yet implemented" |  |
+| variables.rs:98:5:98:13 | PathExpr | 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 | PathExpr |  |
+| 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 | PathExpr |  |
+| variables.rs:102:9:102:10 | s1 | variables.rs:104:11:105:12 | LetExpr | match |
+| variables.rs:102:14:102:17 | PathExpr | variables.rs:102:19:102:30 | PathExpr |  |
+| variables.rs:102:14:102:41 | CallExpr | variables.rs:102:9:102:10 | s1 |  |
+| variables.rs:102:19:102:30 | PathExpr | 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 | PathExpr | 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 | PathExpr |  |
+| 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 | PathExpr |  |
+| variables.rs:111:9:111:10 | x6 | variables.rs:112:5:112:16 | LetStmt | match |
+| variables.rs:111:14:111:17 | PathExpr | 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 | LiteralPat | match |
+| variables.rs:115:9:115:16 | TupleStructPat | variables.rs:116:9:116:16 | TupleStructPat | no-match |
+| variables.rs:115:14:115:15 | LiteralPat | variables.rs:115:21:115:29 | PathExpr | match |
+| variables.rs:115:14:115:15 | LiteralPat | variables.rs:116:9:116:16 | TupleStructPat | no-match |
+| variables.rs:115:21:115:29 | PathExpr | 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 | PathExpr | match |
+| variables.rs:118:9:120:9 | BlockExpr | variables.rs:114:5:122:5 | MatchExpr |  |
+| variables.rs:119:13:119:21 | PathExpr | 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 | PathExpr | match |
+| variables.rs:121:17:121:25 | PathExpr | 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 | PathExpr | 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 | PathExpr |  |
+| 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 | PathExpr | 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 | PathExpr |  |
+| variables.rs:136:23:136:27 | first | variables.rs:136:13:136:28 | CallExpr |  |
+| variables.rs:137:13:137:21 | PathExpr | 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 | PathExpr |  |
-| variables.rs:137:23:137:27 | first | variables.rs:137:13:137:28 | CallExpr |  |
-| variables.rs:138:13:138:21 | PathExpr | variables.rs:138:23:138:26 | last |  |
-| variables.rs:138:13:138:27 | CallExpr | variables.rs:136:14:139:9 | BlockExpr |  |
-| variables.rs:138:13:138:28 | ExprStmt | variables.rs:138:13:138:21 | PathExpr |  |
-| variables.rs:138:23:138:26 | last | variables.rs:138:13:138:27 | CallExpr |  |
-| variables.rs:143:1:151:1 | enter match_pattern3 | variables.rs:144:5:144:38 | LetStmt |  |
-| variables.rs:143:1:151:1 | exit match_pattern3 (normal) | variables.rs:143:1:151:1 | exit match_pattern3 |  |
-| variables.rs:143:21:151:1 | BlockExpr | variables.rs:143:1:151:1 | exit match_pattern3 (normal) |  |
-| variables.rs:144:5:144:38 | LetStmt | variables.rs:144:25:144:27 | "x" |  |
-| variables.rs:144:9:144:10 | p2 | variables.rs:146:11:146:12 | p2 | match |
-| variables.rs:144:14:144:37 | RecordExpr | variables.rs:144:9:144:10 | p2 |  |
-| variables.rs:144:25:144:27 | "x" | variables.rs:144:33:144:35 | "y" |  |
-| variables.rs:144:33:144:35 | "y" | variables.rs:144:14:144:37 | RecordExpr |  |
-| variables.rs:146:5:150:5 | MatchExpr | variables.rs:143:21:151:1 | BlockExpr |  |
-| variables.rs:146:11:146:12 | p2 | variables.rs:147:9:149:9 | RecordPat |  |
-| variables.rs:147:9:149:9 | RecordPat | variables.rs:148:16:148:17 | x7 | match |
-| variables.rs:148:16:148:17 | x7 | variables.rs:148:20:148:21 | RestPat | match |
-| variables.rs:148:20:148:21 | RestPat | variables.rs:149:14:149:22 | PathExpr | match |
-| variables.rs:149:14:149:22 | PathExpr | variables.rs:149:24:149:25 | x7 |  |
-| variables.rs:149:14:149:26 | CallExpr | variables.rs:146:5:150:5 | MatchExpr |  |
-| variables.rs:149:24:149:25 | x7 | variables.rs:149:14:149:26 | CallExpr |  |
-| variables.rs:157:1:170:1 | enter match_pattern4 | variables.rs:158:5:158:39 | LetStmt |  |
-| variables.rs:157:1:170:1 | exit match_pattern4 (normal) | variables.rs:157:1:170:1 | exit match_pattern4 |  |
-| variables.rs:157:21:170:1 | BlockExpr | variables.rs:157:1:170:1 | exit match_pattern4 (normal) |  |
-| variables.rs:158:5:158:39 | LetStmt | variables.rs:158:36:158:36 | 0 |  |
-| variables.rs:158:9:158:11 | msg | variables.rs:160:11:160:13 | msg | match |
-| variables.rs:158:15:158:38 | RecordExpr | variables.rs:158:9:158:11 | msg |  |
-| variables.rs:158:36:158:36 | 0 | variables.rs:158:15:158:38 | RecordExpr |  |
-| variables.rs:160:5:169:5 | MatchExpr | variables.rs:157:21:170:1 | BlockExpr |  |
-| variables.rs:160:11:160:13 | msg | variables.rs:161:9:163:9 | RecordPat |  |
-| variables.rs:161:9:163:9 | RecordPat | variables.rs:162:31:162:35 | RangePat | match |
-| variables.rs:161:9:163:9 | RecordPat | variables.rs:164:9:164:38 | RecordPat | no-match |
-| variables.rs:162:17:162:35 | [match(true)] id_variable | variables.rs:163:14:163:22 | PathExpr | match |
-| variables.rs:162:31:162:31 | LiteralPat | variables.rs:162:35:162:35 | LiteralPat | match |
-| variables.rs:162:31:162:31 | LiteralPat | variables.rs:164:9:164:38 | RecordPat | no-match |
-| variables.rs:162:31:162:35 | RangePat | variables.rs:162:31:162:31 | LiteralPat | match |
-| variables.rs:162:31:162:35 | RangePat | variables.rs:164:9:164:38 | RecordPat | no-match |
-| variables.rs:162:35:162:35 | LiteralPat | variables.rs:162:17:162:35 | [match(true)] id_variable | match |
-| variables.rs:162:35:162:35 | LiteralPat | variables.rs:164:9:164:38 | RecordPat | no-match |
-| variables.rs:163:14:163:22 | PathExpr | variables.rs:163:24:163:34 | id_variable |  |
-| variables.rs:163:14:163:35 | CallExpr | variables.rs:160:5:169:5 | MatchExpr |  |
-| variables.rs:163:24:163:34 | id_variable | variables.rs:163:14:163:35 | CallExpr |  |
-| variables.rs:164:9:164:38 | RecordPat | variables.rs:164:30:164:36 | RangePat | match |
-| variables.rs:164:9:164:38 | RecordPat | variables.rs:167:9:167:29 | RecordPat | no-match |
-| variables.rs:164:30:164:31 | LiteralPat | variables.rs:164:35:164:36 | LiteralPat | match |
-| variables.rs:164:30:164:31 | LiteralPat | variables.rs:167:9:167:29 | RecordPat | no-match |
-| variables.rs:164:30:164:36 | RangePat | variables.rs:164:30:164:31 | LiteralPat | match |
-| variables.rs:164:30:164:36 | RangePat | variables.rs:167:9:167:29 | RecordPat | no-match |
-| variables.rs:164:35:164:36 | LiteralPat | variables.rs:165:22:165:51 | MacroStmts | match |
-| variables.rs:164:35:164:36 | LiteralPat | variables.rs:167:9:167:29 | RecordPat | no-match |
-| variables.rs:164:43:166:9 | BlockExpr | variables.rs:160:5:169:5 | MatchExpr |  |
-| variables.rs:165:13:165:52 | MacroExpr | variables.rs:164:43:166:9 | BlockExpr |  |
-| variables.rs:165:13:165:52 | PathExpr | variables.rs:165:22:165:51 | "Found an id in another range\\n" |  |
-| variables.rs:165:22:165:51 | "Found an id in another range\\n" | variables.rs:165:22:165:51 | FormatArgsExpr |  |
-| variables.rs:165:22:165:51 | BlockExpr | variables.rs:165:13:165:52 | MacroExpr |  |
-| variables.rs:165:22:165:51 | CallExpr | variables.rs:165:22:165:51 | BlockExpr |  |
-| variables.rs:165:22:165:51 | ExprStmt | variables.rs:165:13:165:52 | PathExpr |  |
-| variables.rs:165:22:165:51 | FormatArgsExpr | variables.rs:165:22:165:51 | MacroExpr |  |
-| variables.rs:165:22:165:51 | MacroExpr | variables.rs:165:22:165:51 | CallExpr |  |
-| variables.rs:165:22:165:51 | MacroStmts | variables.rs:165:22:165:51 | ExprStmt |  |
-| variables.rs:167:9:167:29 | RecordPat | variables.rs:167:26:167:27 | id | match |
-| variables.rs:167:26:167:27 | id | variables.rs:168:13:168:21 | PathExpr | match |
-| variables.rs:168:13:168:21 | PathExpr | variables.rs:168:23:168:24 | id |  |
-| variables.rs:168:13:168:25 | CallExpr | variables.rs:160:5:169:5 | MatchExpr |  |
-| variables.rs:168:23:168:24 | id | variables.rs:168:13:168:25 | CallExpr |  |
-| variables.rs:177:1:183:1 | enter match_pattern5 | variables.rs:178:5:178:34 | LetStmt |  |
-| variables.rs:177:1:183:1 | exit match_pattern5 (normal) | variables.rs:177:1:183:1 | exit match_pattern5 |  |
-| variables.rs:177:21:183:1 | BlockExpr | variables.rs:177:1:183:1 | exit match_pattern5 (normal) |  |
-| variables.rs:178:5:178:34 | LetStmt | variables.rs:178:18:178:29 | PathExpr |  |
-| variables.rs:178:9:178:14 | either | variables.rs:179:11:179:16 | either | match |
-| variables.rs:178:18:178:29 | PathExpr | variables.rs:178:31:178:32 | 32 |  |
-| variables.rs:178:18:178:33 | CallExpr | variables.rs:178:9:178:14 | either |  |
-| variables.rs:178:31:178:32 | 32 | variables.rs:178:18:178:33 | CallExpr |  |
-| variables.rs:179:5:182:5 | MatchExpr | variables.rs:177:21:183:1 | BlockExpr |  |
-| variables.rs:179:11:179:16 | either | variables.rs:180:9:180:24 | TupleStructPat |  |
-| variables.rs:180:9:180:24 | TupleStructPat | variables.rs:180:22:180:23 | a3 | match |
-| variables.rs:180:9:180:24 | TupleStructPat | variables.rs:180:28:180:44 | TupleStructPat | no-match |
-| variables.rs:180:9:180:44 | [match(true)] OrPat | variables.rs:181:16:181:24 | PathExpr | match |
-| variables.rs:180:22:180:23 | a3 | variables.rs:180:9:180:44 | [match(true)] OrPat | match |
-| variables.rs:180:28:180:44 | TupleStructPat | variables.rs:180:42:180:43 | a3 | match |
-| variables.rs:180:42:180:43 | a3 | variables.rs:180:9:180:44 | [match(true)] OrPat | match |
-| variables.rs:181:16:181:24 | PathExpr | variables.rs:181:26:181:27 | a3 |  |
-| variables.rs:181:16:181:28 | CallExpr | variables.rs:179:5:182:5 | MatchExpr |  |
-| variables.rs:181:26:181:27 | a3 | variables.rs:181:16:181:28 | CallExpr |  |
-| variables.rs:191:1:205:1 | enter match_pattern6 | variables.rs:192:5:192:37 | LetStmt |  |
-| variables.rs:191:1:205:1 | exit match_pattern6 (normal) | variables.rs:191:1:205:1 | exit match_pattern6 |  |
-| variables.rs:191:21:205:1 | BlockExpr | variables.rs:191:1:205:1 | exit match_pattern6 (normal) |  |
-| variables.rs:192:5:192:37 | LetStmt | variables.rs:192:14:192:32 | PathExpr |  |
-| variables.rs:192:9:192:10 | tv | variables.rs:193:5:196:5 | ExprStmt | match |
-| variables.rs:192:14:192:32 | PathExpr | variables.rs:192:34:192:35 | 62 |  |
-| variables.rs:192:14:192:36 | CallExpr | variables.rs:192:9:192:10 | tv |  |
-| variables.rs:192:34:192:35 | 62 | variables.rs:192:14:192:36 | CallExpr |  |
-| variables.rs:193:5:196:5 | ExprStmt | variables.rs:193:11:193:12 | tv |  |
-| variables.rs:193:5:196:5 | MatchExpr | variables.rs:197:5:200:5 | ExprStmt |  |
-| variables.rs:193:11:193:12 | tv | variables.rs:194:9:194:30 | TupleStructPat |  |
-| variables.rs:194:9:194:30 | TupleStructPat | variables.rs:194:28:194:29 | a4 | match |
-| variables.rs:194:9:194:30 | TupleStructPat | variables.rs:194:34:194:56 | TupleStructPat | no-match |
-| variables.rs:194:9:194:81 | [match(true)] OrPat | variables.rs:195:16:195:24 | PathExpr | match |
-| variables.rs:194:28:194:29 | a4 | variables.rs:194:9:194:81 | [match(true)] OrPat | match |
-| variables.rs:194:34:194:56 | TupleStructPat | variables.rs:194:54:194:55 | a4 | match |
-| variables.rs:194:34:194:56 | TupleStructPat | variables.rs:194:60:194:81 | TupleStructPat | no-match |
-| variables.rs:194:54:194:55 | a4 | variables.rs:194:9:194:81 | [match(true)] OrPat | match |
-| variables.rs:194:60:194:81 | TupleStructPat | variables.rs:194:79:194:80 | a4 | match |
-| variables.rs:194:79:194:80 | a4 | variables.rs:194:9:194:81 | [match(true)] OrPat | match |
-| variables.rs:195:16:195:24 | PathExpr | variables.rs:195:26:195:27 | a4 |  |
-| variables.rs:195:16:195:28 | CallExpr | variables.rs:193:5:196:5 | MatchExpr |  |
-| variables.rs:195:26:195:27 | a4 | variables.rs:195:16:195:28 | CallExpr |  |
-| variables.rs:197:5:200:5 | ExprStmt | variables.rs:197:11:197:12 | tv |  |
-| variables.rs:197:5:200:5 | MatchExpr | variables.rs:201:11:201:12 | tv |  |
-| variables.rs:197:11:197:12 | tv | variables.rs:198:10:198:31 | TupleStructPat |  |
-| variables.rs:198:9:198:83 | [match(true)] OrPat | variables.rs:199:16:199:24 | PathExpr | match |
-| variables.rs:198:10:198:31 | TupleStructPat | variables.rs:198:29:198:30 | a5 | match |
-| variables.rs:198:10:198:31 | TupleStructPat | variables.rs:198:35:198:57 | TupleStructPat | no-match |
-| variables.rs:198:10:198:57 | [match(false)] OrPat | variables.rs:198:62:198:83 | TupleStructPat | no-match |
-| variables.rs:198:10:198:57 | [match(true)] OrPat | variables.rs:198:9:198:83 | [match(true)] OrPat | match |
-| variables.rs:198:29:198:30 | a5 | variables.rs:198:10:198:57 | [match(true)] OrPat | match |
-| variables.rs:198:35:198:57 | TupleStructPat | variables.rs:198:10:198:57 | [match(false)] OrPat | no-match |
-| variables.rs:198:35:198:57 | TupleStructPat | variables.rs:198:55:198:56 | a5 | match |
-| variables.rs:198:55:198:56 | a5 | variables.rs:198:10:198:57 | [match(true)] OrPat | match |
-| variables.rs:198:62:198:83 | TupleStructPat | variables.rs:198:81:198:82 | a5 | match |
-| variables.rs:198:81:198:82 | a5 | variables.rs:198:9:198:83 | [match(true)] OrPat | match |
-| variables.rs:199:16:199:24 | PathExpr | variables.rs:199:26:199:27 | a5 |  |
-| variables.rs:199:16:199:28 | CallExpr | variables.rs:197:5:200:5 | MatchExpr |  |
-| variables.rs:199:26:199:27 | a5 | variables.rs:199:16:199:28 | CallExpr |  |
-| variables.rs:201:5:204:5 | MatchExpr | variables.rs:191:21:205:1 | BlockExpr |  |
-| variables.rs:201:11:201:12 | tv | variables.rs:202:9:202:30 | TupleStructPat |  |
-| variables.rs:202:9:202:30 | TupleStructPat | variables.rs:202:28:202:29 | a6 | match |
-| variables.rs:202:9:202:30 | TupleStructPat | variables.rs:202:35:202:57 | TupleStructPat | no-match |
-| variables.rs:202:9:202:83 | [match(true)] OrPat | variables.rs:203:16:203:24 | PathExpr | match |
-| variables.rs:202:28:202:29 | a6 | variables.rs:202:9:202:83 | [match(true)] OrPat | match |
-| variables.rs:202:35:202:57 | TupleStructPat | variables.rs:202:55:202:56 | a6 | match |
-| variables.rs:202:35:202:57 | TupleStructPat | variables.rs:202:61:202:82 | TupleStructPat | no-match |
-| variables.rs:202:35:202:82 | [match(true)] OrPat | variables.rs:202:9:202:83 | [match(true)] OrPat | match |
-| variables.rs:202:55:202:56 | a6 | variables.rs:202:35:202:82 | [match(true)] OrPat | match |
-| variables.rs:202:61:202:82 | TupleStructPat | variables.rs:202:80:202:81 | a6 | match |
-| variables.rs:202:80:202:81 | a6 | variables.rs:202:35:202:82 | [match(true)] OrPat | match |
-| variables.rs:203:16:203:24 | PathExpr | variables.rs:203:26:203:27 | a6 |  |
-| variables.rs:203:16:203:28 | CallExpr | variables.rs:201:5:204:5 | MatchExpr |  |
-| variables.rs:203:26:203:27 | a6 | variables.rs:203:16:203:28 | CallExpr |  |
-| variables.rs:207:1:215:1 | enter match_pattern7 | variables.rs:208:5:208:34 | LetStmt |  |
-| variables.rs:207:1:215:1 | exit match_pattern7 (normal) | variables.rs:207:1:215:1 | exit match_pattern7 |  |
-| variables.rs:207:21:215:1 | BlockExpr | variables.rs:207:1:215:1 | exit match_pattern7 (normal) |  |
-| variables.rs:208:5:208:34 | LetStmt | variables.rs:208:18:208:29 | PathExpr |  |
-| variables.rs:208:9:208:14 | either | variables.rs:209:11:209:16 | either | match |
-| variables.rs:208:18:208:29 | PathExpr | variables.rs:208:31:208:32 | 32 |  |
-| variables.rs:208:18:208:33 | CallExpr | variables.rs:208:9:208:14 | either |  |
-| variables.rs:208:31:208:32 | 32 | variables.rs:208:18:208:33 | CallExpr |  |
-| variables.rs:209:5:214:5 | MatchExpr | variables.rs:207:21:215:1 | BlockExpr |  |
-| variables.rs:209:11:209:16 | either | variables.rs:210:9:210:24 | TupleStructPat |  |
-| variables.rs:210:9:210:24 | TupleStructPat | variables.rs:210:22:210:23 | a7 | match |
-| variables.rs:210:9:210:24 | TupleStructPat | variables.rs:210:28:210:44 | TupleStructPat | no-match |
-| variables.rs:210:9:210:44 | [match(false)] OrPat | variables.rs:213:9:213:9 | WildcardPat | no-match |
-| variables.rs:210:9:210:44 | [match(true)] OrPat | variables.rs:211:16:211:17 | a7 | match |
-| variables.rs:210:22:210:23 | a7 | variables.rs:210:9:210:44 | [match(true)] OrPat | match |
-| variables.rs:210:28:210:44 | TupleStructPat | variables.rs:210:9:210:44 | [match(false)] OrPat | no-match |
-| variables.rs:210:28:210:44 | TupleStructPat | variables.rs:210:42:210:43 | a7 | match |
-| variables.rs:210:42:210:43 | a7 | variables.rs:210:9:210:44 | [match(true)] OrPat | match |
-| variables.rs:211:16:211:17 | a7 | variables.rs:211:21:211:21 | 0 |  |
-| variables.rs:211:16:211:21 | ... > ... | variables.rs:212:16:212:24 | PathExpr | true |
-| variables.rs:211:16:211:21 | ... > ... | variables.rs:213:9:213:9 | WildcardPat | false |
-| variables.rs:211:21:211:21 | 0 | variables.rs:211:16:211:21 | ... > ... |  |
-| variables.rs:212:16:212:24 | PathExpr | variables.rs:212:26:212:27 | a7 |  |
-| variables.rs:212:16:212:28 | CallExpr | variables.rs:209:5:214:5 | MatchExpr |  |
-| variables.rs:212:26:212:27 | a7 | variables.rs:212:16:212:28 | CallExpr |  |
-| variables.rs:213:9:213:9 | WildcardPat | variables.rs:213:14:213:15 | TupleExpr | match |
-| variables.rs:213:14:213:15 | TupleExpr | variables.rs:209:5:214:5 | MatchExpr |  |
-| variables.rs:217:1:232:1 | enter match_pattern8 | variables.rs:218:5:218:34 | LetStmt |  |
-| variables.rs:217:1:232:1 | exit match_pattern8 (normal) | variables.rs:217:1:232:1 | exit match_pattern8 |  |
-| variables.rs:217:21:232:1 | BlockExpr | variables.rs:217:1:232:1 | exit match_pattern8 (normal) |  |
-| variables.rs:218:5:218:34 | LetStmt | variables.rs:218:18:218:29 | PathExpr |  |
-| variables.rs:218:9:218:14 | either | variables.rs:220:11:220:16 | either | match |
-| variables.rs:218:18:218:29 | PathExpr | variables.rs:218:31:218:32 | 32 |  |
-| variables.rs:218:18:218:33 | CallExpr | variables.rs:218:9:218:14 | either |  |
-| variables.rs:218:31:218:32 | 32 | variables.rs:218:18:218:33 | CallExpr |  |
-| variables.rs:220:5:231:5 | MatchExpr | variables.rs:217:21:232:1 | BlockExpr |  |
-| variables.rs:220:11:220:16 | either | variables.rs:222:14:222:30 | TupleStructPat |  |
-| variables.rs:221:9:222:52 | [match(true)] e | variables.rs:224:13:224:27 | ExprStmt | match |
-| variables.rs:222:14:222:30 | TupleStructPat | variables.rs:222:27:222:29 | a11 | match |
-| variables.rs:222:14:222:30 | TupleStructPat | variables.rs:222:34:222:51 | TupleStructPat | no-match |
-| variables.rs:222:14:222:51 | [match(false)] OrPat | variables.rs:230:9:230:9 | WildcardPat | no-match |
-| variables.rs:222:14:222:51 | [match(true)] OrPat | variables.rs:221:9:222:52 | [match(true)] e | match |
-| variables.rs:222:27:222:29 | a11 | variables.rs:222:14:222:51 | [match(true)] OrPat | match |
-| variables.rs:222:34:222:51 | TupleStructPat | variables.rs:222:14:222:51 | [match(false)] OrPat | no-match |
-| variables.rs:222:34:222:51 | TupleStructPat | variables.rs:222:48:222:50 | a11 | match |
-| variables.rs:222:48:222:50 | a11 | variables.rs:222:14:222:51 | [match(true)] OrPat | match |
-| variables.rs:223:12:229:9 | BlockExpr | variables.rs:220:5:231:5 | MatchExpr |  |
-| variables.rs:224:13:224:21 | PathExpr | variables.rs:224:23:224:25 | a11 |  |
-| variables.rs:224:13:224:26 | CallExpr | variables.rs:225:16:226:15 | LetExpr |  |
-| variables.rs:224:13:224:27 | ExprStmt | variables.rs:224:13:224:21 | PathExpr |  |
-| variables.rs:224:23:224:25 | a11 | variables.rs:224:13:224:26 | CallExpr |  |
-| variables.rs:225:13:228:13 | IfExpr | variables.rs:223:12:229:9 | BlockExpr |  |
-| variables.rs:225:16:226:15 | LetExpr | variables.rs:226:15:226:15 | e |  |
-| variables.rs:225:20:225:36 | TupleStructPat | variables.rs:225:13:228:13 | IfExpr | no-match |
-| variables.rs:225:20:225:36 | TupleStructPat | variables.rs:225:33:225:35 | a12 | match |
-| variables.rs:225:33:225:35 | a12 | variables.rs:227:17:227:32 | ExprStmt | match |
-| variables.rs:226:15:226:15 | e | variables.rs:225:20:225:36 | TupleStructPat |  |
-| variables.rs:226:17:228:13 | BlockExpr | variables.rs:225:13:228:13 | IfExpr |  |
-| variables.rs:227:17:227:25 | PathExpr | variables.rs:227:28:227:30 | a12 |  |
-| variables.rs:227:17:227:31 | CallExpr | variables.rs:226:17:228:13 | BlockExpr |  |
-| variables.rs:227:17:227:32 | ExprStmt | variables.rs:227:17:227:25 | PathExpr |  |
-| variables.rs:227:27:227:30 | * ... | variables.rs:227:17:227:31 | CallExpr |  |
-| variables.rs:227:28:227:30 | a12 | variables.rs:227:27:227:30 | * ... |  |
-| variables.rs:230:9:230:9 | WildcardPat | variables.rs:230:14:230:15 | TupleExpr | match |
-| variables.rs:230:14:230:15 | TupleExpr | variables.rs:220:5:231:5 | MatchExpr |  |
-| variables.rs:241:1:247:1 | enter match_pattern9 | variables.rs:242:5:242:36 | LetStmt |  |
-| variables.rs:241:1:247:1 | exit match_pattern9 (normal) | variables.rs:241:1:247:1 | exit match_pattern9 |  |
-| variables.rs:241:21:247:1 | BlockExpr | variables.rs:241:1:247:1 | exit match_pattern9 (normal) |  |
-| variables.rs:242:5:242:36 | LetStmt | variables.rs:242:14:242:31 | PathExpr |  |
-| variables.rs:242:9:242:10 | fv | variables.rs:243:11:243:12 | fv | match |
-| variables.rs:242:14:242:31 | PathExpr | variables.rs:242:33:242:34 | 62 |  |
-| variables.rs:242:14:242:35 | CallExpr | variables.rs:242:9:242:10 | fv |  |
-| variables.rs:242:33:242:34 | 62 | variables.rs:242:14:242:35 | CallExpr |  |
-| variables.rs:243:5:246:5 | MatchExpr | variables.rs:241:21:247:1 | BlockExpr |  |
-| variables.rs:243:11:243:12 | fv | variables.rs:244:9:244:30 | TupleStructPat |  |
-| variables.rs:244:9:244:30 | TupleStructPat | variables.rs:244:27:244:29 | a13 | match |
-| variables.rs:244:9:244:30 | TupleStructPat | variables.rs:244:35:244:57 | TupleStructPat | no-match |
-| variables.rs:244:9:244:109 | [match(true)] OrPat | variables.rs:245:16:245:24 | PathExpr | match |
-| variables.rs:244:27:244:29 | a13 | variables.rs:244:9:244:109 | [match(true)] OrPat | match |
-| variables.rs:244:35:244:57 | TupleStructPat | variables.rs:244:54:244:56 | a13 | match |
-| variables.rs:244:35:244:57 | TupleStructPat | variables.rs:244:61:244:82 | TupleStructPat | no-match |
-| variables.rs:244:35:244:82 | [match(false)] OrPat | variables.rs:244:87:244:109 | TupleStructPat | no-match |
-| variables.rs:244:35:244:82 | [match(true)] OrPat | variables.rs:244:9:244:109 | [match(true)] OrPat | match |
-| variables.rs:244:54:244:56 | a13 | variables.rs:244:35:244:82 | [match(true)] OrPat | match |
-| variables.rs:244:61:244:82 | TupleStructPat | variables.rs:244:35:244:82 | [match(false)] OrPat | no-match |
-| variables.rs:244:61:244:82 | TupleStructPat | variables.rs:244:79:244:81 | a13 | match |
-| variables.rs:244:79:244:81 | a13 | variables.rs:244:35:244:82 | [match(true)] OrPat | match |
-| variables.rs:244:87:244:109 | TupleStructPat | variables.rs:244:106:244:108 | a13 | match |
-| variables.rs:244:106:244:108 | a13 | variables.rs:244:9:244:109 | [match(true)] OrPat | match |
-| variables.rs:245:16:245:24 | PathExpr | variables.rs:245:26:245:28 | a13 |  |
-| variables.rs:245:16:245:29 | CallExpr | variables.rs:243:5:246:5 | MatchExpr |  |
-| variables.rs:245:26:245:28 | a13 | variables.rs:245:16:245:29 | CallExpr |  |
-| variables.rs:249:1:258:1 | enter param_pattern1 | variables.rs:250:5:250:6 | a8 |  |
-| variables.rs:249:1:258:1 | exit param_pattern1 (normal) | variables.rs:249:1:258:1 | exit param_pattern1 |  |
-| variables.rs:250:5:250:6 | a8 | variables.rs:250:5:250:12 | Param | match |
-| variables.rs:250:5:250:12 | Param | variables.rs:251:5:254:5 | TuplePat |  |
-| variables.rs:251:5:254:5 | TuplePat | variables.rs:252:9:252:10 | b3 | match |
-| variables.rs:251:5:254:19 | Param | variables.rs:255:5:255:18 | ExprStmt |  |
-| variables.rs:252:9:252:10 | b3 | variables.rs:253:9:253:10 | c1 | match |
-| variables.rs:253:9:253:10 | c1 | variables.rs:251:5:254:19 | Param | match |
-| variables.rs:254:28:258:1 | BlockExpr | variables.rs:249:1:258:1 | exit param_pattern1 (normal) |  |
-| variables.rs:255:5:255:13 | PathExpr | variables.rs:255:15:255:16 | a8 |  |
-| variables.rs:255:5:255:17 | CallExpr | variables.rs:256:5:256:18 | ExprStmt |  |
-| variables.rs:255:5:255:18 | ExprStmt | variables.rs:255:5:255:13 | PathExpr |  |
-| variables.rs:255:15:255:16 | a8 | variables.rs:255:5:255:17 | CallExpr |  |
-| variables.rs:256:5:256:13 | PathExpr | variables.rs:256:15:256:16 | b3 |  |
-| variables.rs:256:5:256:17 | CallExpr | variables.rs:257:5:257:18 | ExprStmt |  |
-| variables.rs:256:5:256:18 | ExprStmt | variables.rs:256:5:256:13 | PathExpr |  |
-| variables.rs:256:15:256:16 | b3 | variables.rs:256:5:256:17 | CallExpr |  |
-| variables.rs:257:5:257:13 | PathExpr | variables.rs:257:15:257:16 | c1 |  |
-| variables.rs:257:5:257:17 | CallExpr | variables.rs:254:28:258:1 | BlockExpr |  |
-| variables.rs:257:5:257:18 | ExprStmt | variables.rs:257:5:257:13 | PathExpr |  |
-| variables.rs:257:15:257:16 | c1 | variables.rs:257:5:257:17 | CallExpr |  |
-| variables.rs:260:1:264:1 | enter param_pattern2 | variables.rs:261:6:261:21 | TupleStructPat |  |
-| variables.rs:260:1:264:1 | exit param_pattern2 (normal) | variables.rs:260:1:264:1 | exit param_pattern2 |  |
-| variables.rs:261:5:261:50 | Param | variables.rs:263:5:263:18 | ExprStmt |  |
-| variables.rs:261:6:261:21 | TupleStructPat | variables.rs:261:19:261:20 | a9 | match |
-| variables.rs:261:6:261:21 | TupleStructPat | variables.rs:261:25:261:41 | TupleStructPat | no-match |
-| variables.rs:261:6:261:41 | [match(true)] OrPat | variables.rs:261:5:261:50 | Param | match |
-| variables.rs:261:19:261:20 | a9 | variables.rs:261:6:261:41 | [match(true)] OrPat | match |
-| variables.rs:261:25:261:41 | TupleStructPat | variables.rs:261:39:261:40 | a9 | match |
-| variables.rs:261:39:261:40 | a9 | variables.rs:261:6:261:41 | [match(true)] OrPat | match |
-| variables.rs:262:9:264:1 | BlockExpr | variables.rs:260:1:264:1 | exit param_pattern2 (normal) |  |
-| variables.rs:263:5:263:13 | PathExpr | variables.rs:263:15:263:16 | a9 |  |
-| variables.rs:263:5:263:17 | CallExpr | variables.rs:262:9:264:1 | BlockExpr |  |
-| variables.rs:263:5:263:18 | ExprStmt | variables.rs:263:5:263:13 | PathExpr |  |
-| variables.rs:263:15:263:16 | a9 | variables.rs:263:5:263:17 | CallExpr |  |
-| variables.rs:266:1:301:1 | enter destruct_assignment | variables.rs:267:5:271:18 | LetStmt |  |
-| variables.rs:266:1:301:1 | exit destruct_assignment (normal) | variables.rs:266:1:301:1 | exit destruct_assignment |  |
-| variables.rs:266:26:301:1 | BlockExpr | variables.rs:266:1:301:1 | exit destruct_assignment (normal) |  |
-| variables.rs:267:5:271:18 | LetStmt | variables.rs:271:10:271:10 | 1 |  |
-| variables.rs:267:9:271:5 | TuplePat | variables.rs:268:9:268:15 | a10 | match |
-| variables.rs:268:9:268:15 | a10 | variables.rs:269:9:269:14 | b4 | match |
-| variables.rs:269:9:269:14 | b4 | variables.rs:270:9:270:14 | c2 | match |
-| variables.rs:270:9:270:14 | c2 | variables.rs:272:5:272:19 | ExprStmt | match |
-| variables.rs:271:9:271:17 | TupleExpr | variables.rs:267:9:271:5 | TuplePat |  |
-| variables.rs:271:10:271:10 | 1 | variables.rs:271:13:271:13 | 2 |  |
-| variables.rs:271:13:271:13 | 2 | variables.rs:271:16:271:16 | 3 |  |
-| variables.rs:271:16:271:16 | 3 | variables.rs:271:9:271:17 | TupleExpr |  |
-| variables.rs:272:5:272:13 | PathExpr | variables.rs:272:15:272:17 | a10 |  |
-| variables.rs:272:5:272:18 | CallExpr | variables.rs:273:5:273:18 | ExprStmt |  |
-| variables.rs:272:5:272:19 | ExprStmt | variables.rs:272:5:272:13 | PathExpr |  |
-| variables.rs:272:15:272:17 | a10 | variables.rs:272:5:272:18 | CallExpr |  |
-| variables.rs:273:5:273:13 | PathExpr | variables.rs:273:15:273:16 | b4 |  |
-| variables.rs:273:5:273:17 | CallExpr | variables.rs:274:5:274:18 | ExprStmt |  |
-| variables.rs:273:5:273:18 | ExprStmt | variables.rs:273:5:273:13 | PathExpr |  |
-| variables.rs:273:15:273:16 | b4 | variables.rs:273:5:273:17 | CallExpr |  |
-| variables.rs:274:5:274:13 | PathExpr | variables.rs:274:15:274:16 | c2 |  |
-| variables.rs:274:5:274:17 | CallExpr | variables.rs:276:5:284:6 | ExprStmt |  |
+| variables.rs:137:23:137:27 | third | variables.rs:137:13:137:28 | CallExpr |  |
+| variables.rs:138:13:138:21 | PathExpr | 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 | PathExpr |  |
+| 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 | PathExpr | 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 | PathExpr |  |
+| variables.rs:148:23:148:27 | first | variables.rs:148:13:148:28 | CallExpr |  |
+| variables.rs:149:13:149:21 | PathExpr | 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 | PathExpr |  |
+| 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 | PathExpr | match |
+| variables.rs:160:14:160:22 | PathExpr | 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 | PathExpr | match |
+| variables.rs:173:31:173:31 | LiteralPat | variables.rs:173:35:173:35 | LiteralPat | 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 | LiteralPat | match |
+| variables.rs:173:31:173:35 | RangePat | variables.rs:175:9:175:38 | RecordPat | no-match |
+| 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 | PathExpr | 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 | LiteralPat | variables.rs:175:35:175:36 | LiteralPat | 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 | LiteralPat | match |
+| variables.rs:175:30:175:36 | RangePat | variables.rs:178:9:178:29 | RecordPat | no-match |
+| 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 | MacroExpr | variables.rs:175:43:177:9 | BlockExpr |  |
+| variables.rs:176:13:176:52 | PathExpr | variables.rs:176:22:176:51 | "Found an id in another range\\n" |  |
+| 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 | PathExpr |  |
+| 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 | PathExpr | match |
+| variables.rs:179:13:179:21 | PathExpr | 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 | PathExpr |  |
+| variables.rs:189:9:189:14 | either | variables.rs:190:11:190:16 | either | match |
+| variables.rs:189:18:189:29 | PathExpr | 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 | PathExpr | 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 | PathExpr | 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 | PathExpr |  |
+| variables.rs:203:9:203:10 | tv | variables.rs:204:5:207:5 | ExprStmt | match |
+| variables.rs:203:14:203:32 | PathExpr | 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 | PathExpr | 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 | PathExpr | 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 | PathExpr | 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 | PathExpr | 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 | PathExpr | 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 | PathExpr | 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 | PathExpr |  |
+| variables.rs:219:9:219:14 | either | variables.rs:220:11:220:16 | either | match |
+| variables.rs:219:18:219:29 | PathExpr | 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 | PathExpr | 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 | PathExpr | 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 | PathExpr |  |
+| variables.rs:229:9:229:14 | either | variables.rs:231:11:231:16 | either | match |
+| variables.rs:229:18:229:29 | PathExpr | 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 | PathExpr | 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 | PathExpr |  |
+| 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 | PathExpr | 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 | PathExpr |  |
+| 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 | PathExpr |  |
+| variables.rs:253:9:253:10 | fv | variables.rs:254:11:254:12 | fv | match |
+| variables.rs:253:14:253:31 | PathExpr | 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 | PathExpr | 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 | PathExpr | 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 | PathExpr | 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 | PathExpr |  |
+| variables.rs:266:15:266:16 | a8 | variables.rs:266:5:266:17 | CallExpr |  |
+| variables.rs:267:5:267:13 | PathExpr | 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 | PathExpr |  |
+| variables.rs:267:15:267:16 | b3 | variables.rs:267:5:267:17 | CallExpr |  |
+| variables.rs:268:5:268:13 | PathExpr | 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 | PathExpr |  |
+| 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 | PathExpr | 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 | PathExpr |  |
-| variables.rs:274:15:274:16 | c2 | variables.rs:274:5:274:17 | CallExpr |  |
-| variables.rs:276:5:280:5 | TupleExpr | variables.rs:281:9:281:11 | a10 |  |
-| variables.rs:276:5:284:5 | ... = ... | variables.rs:285:5:285:19 | ExprStmt |  |
-| variables.rs:276:5:284:6 | ExprStmt | variables.rs:277:9:277:10 | c2 |  |
-| variables.rs:277:9:277:10 | c2 | variables.rs:278:9:278:10 | b4 |  |
-| variables.rs:278:9:278:10 | b4 | variables.rs:279:9:279:11 | a10 |  |
-| variables.rs:279:9:279:11 | a10 | variables.rs:276:5:280:5 | TupleExpr |  |
-| variables.rs:280:9:284:5 | TupleExpr | variables.rs:276:5:284:5 | ... = ... |  |
-| variables.rs:281:9:281:11 | a10 | variables.rs:282:9:282:10 | b4 |  |
-| variables.rs:282:9:282:10 | b4 | variables.rs:283:9:283:10 | c2 |  |
-| variables.rs:283:9:283:10 | c2 | variables.rs:280:9:284:5 | TupleExpr |  |
-| variables.rs:285:5:285:13 | PathExpr | variables.rs:285:15:285:17 | a10 |  |
-| variables.rs:285:5:285:18 | CallExpr | variables.rs:286:5:286:18 | ExprStmt |  |
-| variables.rs:285:5:285:19 | ExprStmt | variables.rs:285:5:285:13 | PathExpr |  |
-| variables.rs:285:15:285:17 | a10 | variables.rs:285:5:285:18 | CallExpr |  |
-| variables.rs:286:5:286:13 | PathExpr | variables.rs:286:15:286:16 | b4 |  |
-| variables.rs:286:5:286:17 | CallExpr | variables.rs:287:5:287:18 | ExprStmt |  |
-| variables.rs:286:5:286:18 | ExprStmt | variables.rs:286:5:286:13 | PathExpr |  |
-| variables.rs:286:15:286:16 | b4 | variables.rs:286:5:286:17 | CallExpr |  |
-| variables.rs:287:5:287:13 | PathExpr | variables.rs:287:15:287:16 | c2 |  |
-| variables.rs:287:5:287:17 | CallExpr | variables.rs:289:5:297:5 | ExprStmt |  |
-| variables.rs:287:5:287:18 | ExprStmt | variables.rs:287:5:287:13 | PathExpr |  |
-| variables.rs:287:15:287:16 | c2 | variables.rs:287:5:287:17 | CallExpr |  |
-| variables.rs:289:5:297:5 | ExprStmt | variables.rs:289:12:289:12 | 4 |  |
-| variables.rs:289:5:297:5 | MatchExpr | variables.rs:299:5:299:19 | ExprStmt |  |
-| variables.rs:289:11:289:16 | TupleExpr | variables.rs:290:9:293:9 | TuplePat |  |
-| variables.rs:289:12:289:12 | 4 | variables.rs:289:15:289:15 | 5 |  |
-| variables.rs:289:15:289:15 | 5 | variables.rs:289:11:289:16 | TupleExpr |  |
-| variables.rs:290:9:293:9 | TuplePat | variables.rs:291:13:291:15 | a10 | match |
-| variables.rs:291:13:291:15 | a10 | variables.rs:292:13:292:14 | b4 | match |
-| variables.rs:292:13:292:14 | b4 | variables.rs:294:13:294:27 | ExprStmt | match |
-| variables.rs:293:14:296:9 | BlockExpr | variables.rs:289:5:297:5 | MatchExpr |  |
-| variables.rs:294:13:294:21 | PathExpr | variables.rs:294:23:294:25 | a10 |  |
-| variables.rs:294:13:294:26 | CallExpr | variables.rs:295:13:295:26 | ExprStmt |  |
-| variables.rs:294:13:294:27 | ExprStmt | variables.rs:294:13:294:21 | PathExpr |  |
-| variables.rs:294:23:294:25 | a10 | variables.rs:294:13:294:26 | CallExpr |  |
-| variables.rs:295:13:295:21 | PathExpr | variables.rs:295:23:295:24 | b4 |  |
-| variables.rs:295:13:295:25 | CallExpr | variables.rs:293:14:296:9 | BlockExpr |  |
-| variables.rs:295:13:295:26 | ExprStmt | variables.rs:295:13:295:21 | PathExpr |  |
-| variables.rs:295:23:295:24 | b4 | variables.rs:295:13:295:25 | CallExpr |  |
-| variables.rs:299:5:299:13 | PathExpr | variables.rs:299:15:299:17 | a10 |  |
-| variables.rs:299:5:299:18 | CallExpr | variables.rs:300:5:300:18 | ExprStmt |  |
-| variables.rs:299:5:299:19 | ExprStmt | variables.rs:299:5:299:13 | PathExpr |  |
-| variables.rs:299:15:299:17 | a10 | variables.rs:299:5:299:18 | CallExpr |  |
-| variables.rs:300:5:300:13 | PathExpr | variables.rs:300:15:300:16 | b4 |  |
-| variables.rs:300:5:300:17 | CallExpr | variables.rs:266:26:301:1 | BlockExpr |  |
-| variables.rs:300:5:300:18 | ExprStmt | variables.rs:300:5:300:13 | PathExpr |  |
-| variables.rs:300:15:300:16 | b4 | variables.rs:300:5:300:17 | CallExpr |  |
-| variables.rs:303:1:318:1 | enter closure_variable | variables.rs:304:5:306:10 | LetStmt |  |
-| variables.rs:303:1:318:1 | exit closure_variable (normal) | variables.rs:303:1:318:1 | exit closure_variable |  |
-| variables.rs:303:23:318:1 | BlockExpr | variables.rs:303:1:318:1 | exit closure_variable (normal) |  |
-| variables.rs:304:5:306:10 | LetStmt | variables.rs:305:9:306:9 | ClosureExpr |  |
-| variables.rs:304:9:304:23 | example_closure | variables.rs:307:5:308:27 | LetStmt | match |
-| variables.rs:305:9:306:9 | ClosureExpr | variables.rs:304:9:304:23 | example_closure |  |
-| variables.rs:305:9:306:9 | enter ClosureExpr | variables.rs:305:10:305:10 | x |  |
-| variables.rs:305:9:306:9 | exit ClosureExpr (normal) | variables.rs:305:9:306:9 | exit ClosureExpr |  |
-| variables.rs:305:10:305:10 | x | variables.rs:305:10:305:15 | Param | match |
-| variables.rs:305:10:305:15 | Param | variables.rs:306:9:306:9 | x |  |
-| variables.rs:306:9:306:9 | x | variables.rs:305:9:306:9 | exit ClosureExpr (normal) |  |
-| variables.rs:307:5:308:27 | LetStmt | variables.rs:308:9:308:23 | example_closure |  |
-| variables.rs:307:9:307:10 | n1 | variables.rs:309:5:309:18 | ExprStmt | match |
-| variables.rs:308:9:308:23 | example_closure | variables.rs:308:25:308:25 | 5 |  |
-| variables.rs:308:9:308:26 | CallExpr | variables.rs:307:9:307:10 | n1 |  |
-| variables.rs:308:25:308:25 | 5 | variables.rs:308:9:308:26 | CallExpr |  |
-| variables.rs:309:5:309:13 | PathExpr | variables.rs:309:15:309:16 | n1 |  |
-| variables.rs:309:5:309:17 | CallExpr | variables.rs:311:5:311:25 | ExprStmt |  |
-| variables.rs:309:5:309:18 | ExprStmt | variables.rs:309:5:309:13 | PathExpr |  |
-| variables.rs:309:15:309:16 | n1 | variables.rs:309:5:309:17 | CallExpr |  |
-| variables.rs:311:5:311:22 | PathExpr | variables.rs:311:5:311:24 | CallExpr |  |
-| variables.rs:311:5:311:24 | CallExpr | variables.rs:312:5:314:10 | LetStmt |  |
-| variables.rs:311:5:311:25 | ExprStmt | variables.rs:311:5:311:22 | PathExpr |  |
-| variables.rs:312:5:314:10 | LetStmt | variables.rs:313:9:314:9 | ClosureExpr |  |
-| variables.rs:312:9:312:26 | immutable_variable | variables.rs:315:5:316:30 | LetStmt | match |
-| variables.rs:313:9:314:9 | ClosureExpr | variables.rs:312:9:312:26 | immutable_variable |  |
-| variables.rs:313:9:314:9 | enter ClosureExpr | variables.rs:313:10:313:10 | x |  |
-| variables.rs:313:9:314:9 | exit ClosureExpr (normal) | variables.rs:313:9:314:9 | exit ClosureExpr |  |
-| variables.rs:313:10:313:10 | x | variables.rs:313:10:313:15 | Param | match |
-| variables.rs:313:10:313:15 | Param | variables.rs:314:9:314:9 | x |  |
-| variables.rs:314:9:314:9 | x | variables.rs:313:9:314:9 | exit ClosureExpr (normal) |  |
-| variables.rs:315:5:316:30 | LetStmt | variables.rs:316:9:316:26 | immutable_variable |  |
-| variables.rs:315:9:315:10 | n2 | variables.rs:317:5:317:18 | ExprStmt | match |
-| variables.rs:316:9:316:26 | immutable_variable | variables.rs:316:28:316:28 | 6 |  |
-| variables.rs:316:9:316:29 | CallExpr | variables.rs:315:9:315:10 | n2 |  |
-| variables.rs:316:28:316:28 | 6 | variables.rs:316:9:316:29 | CallExpr |  |
-| variables.rs:317:5:317:13 | PathExpr | variables.rs:317:15:317:16 | n2 |  |
-| variables.rs:317:5:317:17 | CallExpr | variables.rs:303:23:318:1 | BlockExpr |  |
-| variables.rs:317:5:317:18 | ExprStmt | variables.rs:317:5:317:13 | PathExpr |  |
-| variables.rs:317:15:317:16 | n2 | variables.rs:317:5:317:17 | CallExpr |  |
-| variables.rs:320:1:327:1 | enter for_variable | variables.rs:321:5:321:42 | LetStmt |  |
-| variables.rs:320:1:327:1 | exit for_variable (normal) | variables.rs:320:1:327:1 | exit for_variable |  |
-| variables.rs:320:19:327:1 | BlockExpr | variables.rs:320:1:327:1 | exit for_variable (normal) |  |
-| variables.rs:321:5:321:42 | LetStmt | variables.rs:321:15:321:22 | "apples" |  |
-| variables.rs:321:9:321:9 | v | variables.rs:324:12:324:12 | v | match |
-| variables.rs:321:13:321:41 | RefExpr | variables.rs:321:9:321:9 | v |  |
-| variables.rs:321:14:321:41 | ArrayExpr | variables.rs:321:13:321:41 | RefExpr |  |
-| variables.rs:321:15:321:22 | "apples" | variables.rs:321:25:321:30 | "cake" |  |
-| variables.rs:321:25:321:30 | "cake" | variables.rs:321:33:321:40 | "coffee" |  |
-| variables.rs:321:33:321:40 | "coffee" | variables.rs:321:14:321:41 | ArrayExpr |  |
-| variables.rs:323:5:326:5 | ForExpr | variables.rs:320:19:327:1 | BlockExpr |  |
-| variables.rs:323:9:323:12 | text | variables.rs:323:5:326:5 | ForExpr | no-match |
-| variables.rs:323:9:323:12 | text | variables.rs:325:9:325:24 | ExprStmt | match |
-| variables.rs:324:12:324:12 | v | variables.rs:323:9:323:12 | text |  |
-| variables.rs:324:14:326:5 | BlockExpr | variables.rs:323:9:323:12 | text |  |
-| variables.rs:325:9:325:17 | PathExpr | variables.rs:325:19:325:22 | text |  |
-| variables.rs:325:9:325:23 | CallExpr | variables.rs:324:14:326:5 | BlockExpr |  |
-| variables.rs:325:9:325:24 | ExprStmt | variables.rs:325:9:325:17 | PathExpr |  |
-| variables.rs:325:19:325:22 | text | variables.rs:325:9:325:23 | CallExpr |  |
-| variables.rs:329:1:335:1 | enter add_assign | variables.rs:330:5:330:18 | LetStmt |  |
-| variables.rs:329:1:335:1 | exit add_assign (normal) | variables.rs:329:1:335:1 | exit add_assign |  |
-| variables.rs:329:17:335:1 | BlockExpr | variables.rs:329:1:335:1 | exit add_assign (normal) |  |
-| variables.rs:330:5:330:18 | LetStmt | variables.rs:330:17:330:17 | 0 |  |
-| variables.rs:330:9:330:13 | a | variables.rs:331:5:331:11 | ExprStmt | match |
-| variables.rs:330:17:330:17 | 0 | variables.rs:330:9:330:13 | a |  |
-| variables.rs:331:5:331:5 | a | variables.rs:331:10:331:10 | 1 |  |
-| variables.rs:331:5:331:10 | ... += ... | variables.rs:332:5:332:17 | ExprStmt |  |
-| variables.rs:331:5:331:11 | ExprStmt | variables.rs:331:5:331:5 | a |  |
-| variables.rs:331:10:331:10 | 1 | variables.rs:331:5:331:10 | ... += ... |  |
-| variables.rs:332:5:332:13 | PathExpr | variables.rs:332:15:332:15 | a |  |
-| variables.rs:332:5:332:16 | CallExpr | variables.rs:333:5:333:28 | ExprStmt |  |
-| variables.rs:332:5:332:17 | ExprStmt | variables.rs:332:5:332:13 | PathExpr |  |
-| variables.rs:332:15:332:15 | a | variables.rs:332:5:332:16 | CallExpr |  |
-| variables.rs:333:5:333:27 | MethodCallExpr | variables.rs:334:5:334:17 | ExprStmt |  |
-| variables.rs:333:5:333:28 | ExprStmt | variables.rs:333:25:333:26 | 10 |  |
-| variables.rs:333:6:333:11 | RefExpr | variables.rs:333:5:333:27 | MethodCallExpr |  |
-| variables.rs:333:11:333:11 | a | variables.rs:333:6:333:11 | RefExpr |  |
-| variables.rs:333:25:333:26 | 10 | variables.rs:333:11:333:11 | a |  |
-| variables.rs:334:5:334:13 | PathExpr | variables.rs:334:15:334:15 | a |  |
-| variables.rs:334:5:334:16 | CallExpr | variables.rs:329:17:335:1 | BlockExpr |  |
-| variables.rs:334:5:334:17 | ExprStmt | variables.rs:334:5:334:13 | PathExpr |  |
-| variables.rs:334:15:334:15 | a | variables.rs:334:5:334:16 | CallExpr |  |
-| variables.rs:337:1:343:1 | enter mutate | variables.rs:338:5:338:18 | LetStmt |  |
-| variables.rs:337:1:343:1 | exit mutate (normal) | variables.rs:337:1:343:1 | exit mutate |  |
-| variables.rs:337:13:343:1 | BlockExpr | variables.rs:337:1:343:1 | exit mutate (normal) |  |
-| variables.rs:338:5:338:18 | LetStmt | variables.rs:338:17:338:17 | 1 |  |
-| variables.rs:338:9:338:13 | i | variables.rs:339:5:340:15 | LetStmt | match |
-| variables.rs:338:17:338:17 | 1 | variables.rs:338:9:338:13 | i |  |
-| variables.rs:339:5:340:15 | LetStmt | variables.rs:340:14:340:14 | i |  |
-| variables.rs:339:9:339:13 | ref_i | variables.rs:341:5:341:15 | ExprStmt | match |
-| variables.rs:340:9:340:14 | RefExpr | variables.rs:339:9:339:13 | ref_i |  |
-| variables.rs:340:14:340:14 | i | variables.rs:340:9:340:14 | RefExpr |  |
-| variables.rs:341:5:341:10 | * ... | variables.rs:341:14:341:14 | 2 |  |
-| variables.rs:341:5:341:14 | ... = ... | variables.rs:342:5:342:17 | ExprStmt |  |
-| variables.rs:341:5:341:15 | ExprStmt | variables.rs:341:6:341:10 | ref_i |  |
-| variables.rs:341:6:341:10 | ref_i | variables.rs:341:5:341:10 | * ... |  |
-| variables.rs:341:14:341:14 | 2 | variables.rs:341:5:341:14 | ... = ... |  |
-| variables.rs:342:5:342:13 | PathExpr | variables.rs:342:15:342:15 | i |  |
-| variables.rs:342:5:342:16 | CallExpr | variables.rs:337:13:343:1 | BlockExpr |  |
-| variables.rs:342:5:342:17 | ExprStmt | variables.rs:342:5:342:13 | PathExpr |  |
-| variables.rs:342:15:342:15 | i | variables.rs:342:5:342:16 | CallExpr |  |
-| variables.rs:345:1:350:1 | enter mutate_param | variables.rs:345:17:345:17 | x |  |
-| variables.rs:345:1:350:1 | exit mutate_param (normal) | variables.rs:345:1:350:1 | exit mutate_param |  |
-| variables.rs:345:17:345:17 | x | variables.rs:345:17:345:28 | Param | match |
-| variables.rs:345:17:345:28 | Param | variables.rs:346:5:348:11 | ExprStmt |  |
-| variables.rs:346:5:346:6 | * ... | variables.rs:347:10:347:10 | x |  |
-| variables.rs:346:5:348:10 | ... = ... | variables.rs:349:5:349:13 | ExprStmt |  |
-| variables.rs:346:5:348:11 | ExprStmt | variables.rs:346:6:346:6 | x |  |
-| variables.rs:346:6:346:6 | x | variables.rs:346:5:346:6 | * ... |  |
-| variables.rs:347:9:347:10 | * ... | variables.rs:348:10:348:10 | x |  |
-| variables.rs:347:9:348:10 | ... + ... | variables.rs:346:5:348:10 | ... = ... |  |
-| variables.rs:347:10:347:10 | x | variables.rs:347:9:347:10 | * ... |  |
-| variables.rs:348:9:348:10 | * ... | variables.rs:347:9:348:10 | ... + ... |  |
-| variables.rs:348:10:348:10 | x | variables.rs:348:9:348:10 | * ... |  |
-| variables.rs:349:5:349:12 | ReturnExpr | variables.rs:345:1:350:1 | exit mutate_param (normal) | return |
-| variables.rs:349:5:349:13 | ExprStmt | variables.rs:349:12:349:12 | x |  |
-| variables.rs:349:12:349:12 | x | variables.rs:349:5:349:12 | ReturnExpr |  |
-| variables.rs:352:1:358:1 | enter mutate_param2 | variables.rs:352:22:352:22 | x |  |
-| variables.rs:352:1:358:1 | exit mutate_param2 (normal) | variables.rs:352:1:358:1 | exit mutate_param2 |  |
-| variables.rs:352:22:352:22 | x | variables.rs:352:22:352:36 | Param | match |
-| variables.rs:352:22:352:36 | Param | variables.rs:352:39:352:39 | y |  |
-| variables.rs:352:39:352:39 | y | variables.rs:352:39:352:57 | Param | match |
-| variables.rs:352:39:352:57 | Param | variables.rs:353:5:355:11 | ExprStmt |  |
-| variables.rs:352:60:358:1 | BlockExpr | variables.rs:352:1:358:1 | exit mutate_param2 (normal) |  |
-| variables.rs:353:5:353:6 | * ... | variables.rs:354:10:354:10 | x |  |
-| variables.rs:353:5:355:10 | ... = ... | variables.rs:356:5:357:10 | ExprStmt |  |
-| variables.rs:353:5:355:11 | ExprStmt | variables.rs:353:6:353:6 | x |  |
-| variables.rs:353:6:353:6 | x | variables.rs:353:5:353:6 | * ... |  |
-| variables.rs:354:9:354:10 | * ... | variables.rs:355:10:355:10 | x |  |
-| variables.rs:354:9:355:10 | ... + ... | variables.rs:353:5:355:10 | ... = ... |  |
-| variables.rs:354:10:354:10 | x | variables.rs:354:9:354:10 | * ... |  |
-| variables.rs:355:9:355:10 | * ... | variables.rs:354:9:355:10 | ... + ... |  |
-| variables.rs:355:10:355:10 | x | variables.rs:355:9:355:10 | * ... |  |
-| variables.rs:356:5:356:6 | * ... | variables.rs:357:9:357:9 | x |  |
-| variables.rs:356:5:357:9 | ... = ... | variables.rs:352:60:358:1 | BlockExpr |  |
-| variables.rs:356:5:357:10 | ExprStmt | variables.rs:356:6:356:6 | y |  |
-| variables.rs:356:6:356:6 | y | variables.rs:356:5:356:6 | * ... |  |
-| variables.rs:357:9:357:9 | x | variables.rs:356:5:357:9 | ... = ... |  |
-| variables.rs:360:1:378:1 | enter mutate_arg | variables.rs:361:5:361:18 | LetStmt |  |
-| variables.rs:360:1:378:1 | exit mutate_arg (normal) | variables.rs:360:1:378:1 | exit mutate_arg |  |
-| variables.rs:360:17:378:1 | BlockExpr | variables.rs:360:1:378:1 | exit mutate_arg (normal) |  |
-| variables.rs:361:5:361:18 | LetStmt | variables.rs:361:17:361:17 | 2 |  |
-| variables.rs:361:9:361:13 | x | variables.rs:362:5:363:29 | LetStmt | match |
-| variables.rs:361:17:361:17 | 2 | variables.rs:361:9:361:13 | x |  |
-| variables.rs:362:5:363:29 | LetStmt | variables.rs:363:9:363:20 | PathExpr |  |
-| variables.rs:362:9:362:9 | y | variables.rs:364:5:364:12 | ExprStmt | match |
-| variables.rs:363:9:363:20 | PathExpr | variables.rs:363:27:363:27 | x |  |
-| variables.rs:363:9:363:28 | CallExpr | variables.rs:362:9:362:9 | y |  |
-| variables.rs:363:22:363:27 | RefExpr | variables.rs:363:9:363:28 | CallExpr |  |
-| variables.rs:363:27:363:27 | x | variables.rs:363:22:363:27 | RefExpr |  |
-| variables.rs:364:5:364:6 | * ... | variables.rs:364:10:364:11 | 10 |  |
-| variables.rs:364:5:364:11 | ... = ... | variables.rs:366:5:366:17 | ExprStmt |  |
-| variables.rs:364:5:364:12 | ExprStmt | variables.rs:364:6:364:6 | y |  |
-| variables.rs:364:6:364:6 | y | variables.rs:364:5:364:6 | * ... |  |
-| variables.rs:364:10:364:11 | 10 | variables.rs:364:5:364:11 | ... = ... |  |
-| variables.rs:366:5:366:13 | PathExpr | variables.rs:366:15:366:15 | x |  |
-| variables.rs:366:5:366:16 | CallExpr | variables.rs:368:5:368:18 | LetStmt |  |
-| variables.rs:366:5:366:17 | ExprStmt | variables.rs:366:5:366:13 | PathExpr |  |
-| variables.rs:366:15:366:15 | x | variables.rs:366:5:366:16 | CallExpr |  |
-| variables.rs:368:5:368:18 | LetStmt | variables.rs:368:17:368:17 | 4 |  |
-| variables.rs:368:9:368:13 | z | variables.rs:369:5:370:20 | LetStmt | match |
-| variables.rs:368:17:368:17 | 4 | variables.rs:368:9:368:13 | z |  |
-| variables.rs:369:5:370:20 | LetStmt | variables.rs:370:19:370:19 | x |  |
-| variables.rs:369:9:369:9 | w | variables.rs:371:5:374:6 | ExprStmt | match |
-| variables.rs:370:9:370:19 | RefExpr | variables.rs:369:9:369:9 | w |  |
-| variables.rs:370:14:370:19 | RefExpr | variables.rs:370:9:370:19 | RefExpr |  |
-| variables.rs:370:19:370:19 | x | variables.rs:370:14:370:19 | RefExpr |  |
-| variables.rs:371:5:371:17 | PathExpr | variables.rs:372:14:372:14 | z |  |
-| variables.rs:371:5:374:5 | CallExpr | variables.rs:375:5:375:13 | ExprStmt |  |
-| variables.rs:371:5:374:6 | ExprStmt | variables.rs:371:5:371:17 | PathExpr |  |
-| variables.rs:372:9:372:14 | RefExpr | variables.rs:373:9:373:9 | w |  |
-| variables.rs:372:14:372:14 | z | variables.rs:372:9:372:14 | RefExpr |  |
-| variables.rs:373:9:373:9 | w | variables.rs:371:5:374:5 | CallExpr |  |
-| variables.rs:375:5:375:7 | * ... | variables.rs:375:11:375:12 | 11 |  |
-| variables.rs:375:5:375:12 | ... = ... | variables.rs:377:5:377:17 | ExprStmt |  |
-| variables.rs:375:5:375:13 | ExprStmt | variables.rs:375:7:375:7 | w |  |
-| variables.rs:375:6:375:7 | * ... | variables.rs:375:5:375:7 | * ... |  |
-| variables.rs:375:7:375:7 | w | variables.rs:375:6:375:7 | * ... |  |
-| variables.rs:375:11:375:12 | 11 | variables.rs:375:5:375:12 | ... = ... |  |
-| variables.rs:377:5:377:13 | PathExpr | variables.rs:377:15:377:15 | z |  |
-| variables.rs:377:5:377:16 | CallExpr | variables.rs:360:17:378:1 | BlockExpr |  |
+| 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 | PathExpr | 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 | PathExpr |  |
+| variables.rs:283:15:283:17 | a10 | variables.rs:283:5:283:18 | CallExpr |  |
+| variables.rs:284:5:284:13 | PathExpr | 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 | PathExpr |  |
+| variables.rs:284:15:284:16 | b4 | variables.rs:284:5:284:17 | CallExpr |  |
+| variables.rs:285:5:285:13 | PathExpr | 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 | PathExpr |  |
+| 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 | PathExpr | 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 | PathExpr |  |
+| variables.rs:296:15:296:17 | a10 | variables.rs:296:5:296:18 | CallExpr |  |
+| variables.rs:297:5:297:13 | PathExpr | 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 | PathExpr |  |
+| variables.rs:297:15:297:16 | b4 | variables.rs:297:5:297:17 | CallExpr |  |
+| variables.rs:298:5:298:13 | PathExpr | 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 | PathExpr |  |
+| 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 | PathExpr | 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 | PathExpr |  |
+| variables.rs:305:23:305:25 | a10 | variables.rs:305:13:305:26 | CallExpr |  |
+| variables.rs:306:13:306:21 | PathExpr | 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 | PathExpr |  |
+| variables.rs:306:23:306:24 | b4 | variables.rs:306:13:306:25 | CallExpr |  |
+| variables.rs:310:5:310:13 | PathExpr | 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 | PathExpr |  |
+| variables.rs:310:15:310:17 | a10 | variables.rs:310:5:310:18 | CallExpr |  |
+| variables.rs:311:5:311:13 | PathExpr | 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 | PathExpr |  |
+| 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 | PathExpr | 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 | PathExpr |  |
+| variables.rs:320:15:320:16 | n1 | variables.rs:320:5:320:17 | CallExpr |  |
+| variables.rs:322:5:322:22 | PathExpr | 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 | PathExpr |  |
+| 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 | PathExpr | 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 | PathExpr |  |
+| 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 | PathExpr | 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 | PathExpr |  |
+| 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 | PathExpr | 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 | PathExpr |  |
+| variables.rs:343:15:343:15 | a | variables.rs:343:5:343:16 | CallExpr |  |
+| variables.rs:344:5:344:27 | MethodCallExpr | 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 | MethodCallExpr |  |
+| variables.rs:345:5:345:13 | PathExpr | 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 | PathExpr |  |
+| 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 | PathExpr | 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 | PathExpr |  |
+| 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 | PathExpr |  |
+| variables.rs:373:9:373:9 | y | variables.rs:375:5:375:12 | ExprStmt | match |
+| variables.rs:374:9:374:20 | PathExpr | 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 | PathExpr | 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 | PathExpr |  |
-| variables.rs:377:15:377:15 | z | variables.rs:377:5:377:16 | CallExpr |  |
-| variables.rs:380:1:386:1 | enter alias | variables.rs:381:5:381:18 | LetStmt |  |
-| variables.rs:380:1:386:1 | exit alias (normal) | variables.rs:380:1:386:1 | exit alias |  |
-| variables.rs:380:12:386:1 | BlockExpr | variables.rs:380:1:386:1 | exit alias (normal) |  |
-| variables.rs:381:5:381:18 | LetStmt | variables.rs:381:17:381:17 | 1 |  |
-| variables.rs:381:9:381:13 | x | variables.rs:382:5:383:15 | LetStmt | match |
-| variables.rs:381:17:381:17 | 1 | variables.rs:381:9:381:13 | x |  |
-| variables.rs:382:5:383:15 | LetStmt | variables.rs:383:14:383:14 | x |  |
-| variables.rs:382:9:382:9 | y | variables.rs:384:5:384:11 | ExprStmt | match |
-| variables.rs:383:9:383:14 | RefExpr | variables.rs:382:9:382:9 | y |  |
-| variables.rs:383:14:383:14 | x | variables.rs:383:9:383:14 | RefExpr |  |
-| variables.rs:384:5:384:6 | * ... | variables.rs:384:10:384:10 | 2 |  |
-| variables.rs:384:5:384:10 | ... = ... | variables.rs:385:5:385:17 | ExprStmt |  |
-| variables.rs:384:5:384:11 | ExprStmt | variables.rs:384:6:384:6 | y |  |
-| variables.rs:384:6:384:6 | y | variables.rs:384:5:384:6 | * ... |  |
-| variables.rs:384:10:384:10 | 2 | variables.rs:384:5:384:10 | ... = ... |  |
-| variables.rs:385:5:385:13 | PathExpr | variables.rs:385:15:385:15 | x |  |
-| variables.rs:385:5:385:16 | CallExpr | variables.rs:380:12:386:1 | BlockExpr |  |
-| variables.rs:385:5:385:17 | ExprStmt | variables.rs:385:5:385:13 | PathExpr |  |
-| variables.rs:385:15:385:15 | x | variables.rs:385:5:385:16 | CallExpr |  |
-| variables.rs:388:1:396:1 | enter capture_mut | variables.rs:389:5:389:19 | LetStmt |  |
-| variables.rs:388:1:396:1 | exit capture_mut (normal) | variables.rs:388:1:396:1 | exit capture_mut |  |
-| variables.rs:388:18:396:1 | BlockExpr | variables.rs:388:1:396:1 | exit capture_mut (normal) |  |
-| variables.rs:389:5:389:19 | LetStmt | variables.rs:389:17:389:18 | 10 |  |
-| variables.rs:389:9:389:13 | x | variables.rs:390:5:393:6 | LetStmt | match |
-| variables.rs:389:17:389:18 | 10 | variables.rs:389:9:389:13 | x |  |
-| variables.rs:390:5:393:6 | LetStmt | variables.rs:390:19:393:5 | ClosureExpr |  |
-| variables.rs:390:9:390:15 | cap | variables.rs:394:5:394:10 | ExprStmt | match |
-| variables.rs:390:19:393:5 | ClosureExpr | variables.rs:390:9:390:15 | cap |  |
-| variables.rs:390:19:393:5 | enter ClosureExpr | variables.rs:391:9:391:21 | ExprStmt |  |
-| variables.rs:390:19:393:5 | exit ClosureExpr (normal) | variables.rs:390:19:393:5 | exit ClosureExpr |  |
-| variables.rs:390:22:393:5 | BlockExpr | variables.rs:390:19:393:5 | exit ClosureExpr (normal) |  |
-| variables.rs:391:9:391:17 | PathExpr | variables.rs:391:19:391:19 | x |  |
-| variables.rs:391:9:391:20 | CallExpr | variables.rs:392:9:392:15 | ExprStmt |  |
-| variables.rs:391:9:391:21 | ExprStmt | variables.rs:391:9:391:17 | PathExpr |  |
-| variables.rs:391:19:391:19 | x | variables.rs:391:9:391:20 | CallExpr |  |
-| variables.rs:392:9:392:9 | x | variables.rs:392:14:392:14 | 1 |  |
-| variables.rs:392:9:392:14 | ... += ... | variables.rs:390:22:393:5 | BlockExpr |  |
-| variables.rs:392:9:392:15 | ExprStmt | variables.rs:392:9:392:9 | x |  |
-| variables.rs:392:14:392:14 | 1 | variables.rs:392:9:392:14 | ... += ... |  |
-| variables.rs:394:5:394:7 | cap | variables.rs:394:5:394:9 | CallExpr |  |
-| variables.rs:394:5:394:9 | CallExpr | variables.rs:395:5:395:17 | ExprStmt |  |
-| variables.rs:394:5:394:10 | ExprStmt | variables.rs:394:5:394:7 | cap |  |
-| variables.rs:395:5:395:13 | PathExpr | variables.rs:395:15:395:15 | x |  |
-| variables.rs:395:5:395:16 | CallExpr | variables.rs:388:18:396:1 | BlockExpr |  |
-| variables.rs:395:5:395:17 | ExprStmt | variables.rs:395:5:395:13 | PathExpr |  |
-| variables.rs:395:15:395:15 | x | variables.rs:395:5:395:16 | CallExpr |  |
-| variables.rs:398:1:405:1 | enter capture_immut | variables.rs:399:5:399:16 | LetStmt |  |
-| variables.rs:398:1:405:1 | exit capture_immut (normal) | variables.rs:398:1:405:1 | exit capture_immut |  |
-| variables.rs:398:20:405:1 | BlockExpr | variables.rs:398:1:405:1 | exit capture_immut (normal) |  |
-| variables.rs:399:5:399:16 | LetStmt | variables.rs:399:13:399:15 | 100 |  |
-| variables.rs:399:9:399:9 | x | variables.rs:400:5:402:6 | LetStmt | match |
-| variables.rs:399:13:399:15 | 100 | variables.rs:399:9:399:9 | x |  |
-| variables.rs:400:5:402:6 | LetStmt | variables.rs:400:19:402:5 | ClosureExpr |  |
-| variables.rs:400:9:400:15 | cap | variables.rs:403:5:403:10 | ExprStmt | match |
-| variables.rs:400:19:402:5 | ClosureExpr | variables.rs:400:9:400:15 | cap |  |
-| variables.rs:400:19:402:5 | enter ClosureExpr | variables.rs:401:9:401:21 | ExprStmt |  |
-| variables.rs:400:19:402:5 | exit ClosureExpr (normal) | variables.rs:400:19:402:5 | exit ClosureExpr |  |
-| variables.rs:400:22:402:5 | BlockExpr | variables.rs:400:19:402:5 | exit ClosureExpr (normal) |  |
-| variables.rs:401:9:401:17 | PathExpr | variables.rs:401:19:401:19 | x |  |
-| variables.rs:401:9:401:20 | CallExpr | variables.rs:400:22:402:5 | BlockExpr |  |
-| variables.rs:401:9:401:21 | ExprStmt | variables.rs:401:9:401:17 | PathExpr |  |
-| variables.rs:401:19:401:19 | x | variables.rs:401:9:401:20 | CallExpr |  |
-| variables.rs:403:5:403:7 | cap | variables.rs:403:5:403:9 | CallExpr |  |
-| variables.rs:403:5:403:9 | CallExpr | variables.rs:404:5:404:17 | ExprStmt |  |
-| variables.rs:403:5:403:10 | ExprStmt | variables.rs:403:5:403:7 | cap |  |
-| variables.rs:404:5:404:13 | PathExpr | variables.rs:404:15:404:15 | x |  |
-| variables.rs:404:5:404:16 | CallExpr | variables.rs:398:20:405:1 | BlockExpr |  |
-| variables.rs:404:5:404:17 | ExprStmt | variables.rs:404:5:404:13 | PathExpr |  |
-| variables.rs:404:15:404:15 | x | variables.rs:404:5:404:16 | CallExpr |  |
-| variables.rs:407:1:421:1 | enter phi | variables.rs:407:8:407:8 | b |  |
-| variables.rs:407:1:421:1 | exit phi (normal) | variables.rs:407:1:421:1 | exit phi |  |
-| variables.rs:407:8:407:8 | b | variables.rs:407:8:407:15 | Param | match |
-| variables.rs:407:8:407:15 | Param | variables.rs:408:5:408:18 | LetStmt |  |
-| variables.rs:407:18:421:1 | BlockExpr | variables.rs:407:1:421:1 | exit phi (normal) |  |
-| variables.rs:408:5:408:18 | LetStmt | variables.rs:408:17:408:17 | 1 |  |
-| variables.rs:408:9:408:13 | x | variables.rs:409:5:409:17 | ExprStmt | match |
-| variables.rs:408:17:408:17 | 1 | variables.rs:408:9:408:13 | x |  |
-| variables.rs:409:5:409:13 | PathExpr | variables.rs:409:15:409:15 | x |  |
-| variables.rs:409:5:409:16 | CallExpr | variables.rs:410:5:410:21 | ExprStmt |  |
-| variables.rs:409:5:409:17 | ExprStmt | variables.rs:409:5:409:13 | PathExpr |  |
-| variables.rs:409:15:409:15 | x | variables.rs:409:5:409:16 | CallExpr |  |
-| variables.rs:410:5:410:13 | PathExpr | variables.rs:410:15:410:15 | x |  |
-| variables.rs:410:5:410:20 | CallExpr | variables.rs:411:5:419:5 | ExprStmt |  |
-| variables.rs:410:5:410:21 | ExprStmt | variables.rs:410:5:410:13 | PathExpr |  |
-| variables.rs:410:15:410:15 | x | variables.rs:410:19:410:19 | 1 |  |
-| variables.rs:410:15:410:19 | ... + ... | variables.rs:410:5:410:20 | CallExpr |  |
-| variables.rs:410:19:410:19 | 1 | variables.rs:410:15:410:19 | ... + ... |  |
-| variables.rs:411:5:419:5 | ExprStmt | variables.rs:411:8:411:8 | b |  |
-| variables.rs:411:5:419:5 | IfExpr | variables.rs:420:5:420:17 | ExprStmt |  |
-| variables.rs:411:8:411:8 | b | variables.rs:412:9:412:14 | ExprStmt | true |
-| variables.rs:411:8:411:8 | b | variables.rs:416:9:416:14 | ExprStmt | false |
-| variables.rs:411:10:415:5 | BlockExpr | variables.rs:411:5:419:5 | IfExpr |  |
-| variables.rs:412:9:412:9 | x | variables.rs:412:13:412:13 | 2 |  |
-| variables.rs:412:9:412:13 | ... = ... | variables.rs:413:9:413:21 | ExprStmt |  |
-| variables.rs:412:9:412:14 | ExprStmt | variables.rs:412:9:412:9 | x |  |
-| variables.rs:412:13:412:13 | 2 | variables.rs:412:9:412:13 | ... = ... |  |
+| 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 | PathExpr | 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 | PathExpr |  |
+| 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 | PathExpr | 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 | PathExpr |  |
+| 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 | PathExpr | 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 | PathExpr |  |
+| 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 | PathExpr | 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 | PathExpr |  |
+| 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 | PathExpr | 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 | PathExpr |  |
+| 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 | PathExpr | variables.rs:413:19:413:19 | x |  |
-| variables.rs:413:9:413:20 | CallExpr | variables.rs:414:9:414:25 | ExprStmt |  |
+| 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 | PathExpr |  |
 | variables.rs:413:19:413:19 | x | variables.rs:413:9:413:20 | CallExpr |  |
-| variables.rs:414:9:414:17 | PathExpr | variables.rs:414:19:414:19 | x |  |
-| variables.rs:414:9:414:24 | CallExpr | variables.rs:411:10:415:5 | BlockExpr |  |
-| variables.rs:414:9:414:25 | ExprStmt | variables.rs:414:9:414:17 | PathExpr |  |
-| variables.rs:414:19:414:19 | x | variables.rs:414:23:414:23 | 1 |  |
-| variables.rs:414:19:414:23 | ... + ... | variables.rs:414:9:414:24 | CallExpr |  |
-| variables.rs:414:23:414:23 | 1 | variables.rs:414:19:414:23 | ... + ... |  |
-| variables.rs:415:12:419:5 | BlockExpr | variables.rs:411:5:419:5 | IfExpr |  |
-| variables.rs:416:9:416:9 | x | variables.rs:416:13:416:13 | 3 |  |
-| variables.rs:416:9:416:13 | ... = ... | variables.rs:417:9:417:21 | ExprStmt |  |
-| variables.rs:416:9:416:14 | ExprStmt | variables.rs:416:9:416:9 | x |  |
-| variables.rs:416:13:416:13 | 3 | variables.rs:416:9:416:13 | ... = ... |  |
-| variables.rs:417:9:417:17 | PathExpr | variables.rs:417:19:417:19 | x |  |
-| variables.rs:417:9:417:20 | CallExpr | variables.rs:418:9:418:25 | ExprStmt |  |
-| variables.rs:417:9:417:21 | ExprStmt | variables.rs:417:9:417:17 | PathExpr |  |
-| variables.rs:417:19:417:19 | x | variables.rs:417:9:417:20 | CallExpr |  |
-| variables.rs:418:9:418:17 | PathExpr | variables.rs:418:19:418:19 | x |  |
-| variables.rs:418:9:418:24 | CallExpr | variables.rs:415:12:419:5 | BlockExpr |  |
-| variables.rs:418:9:418:25 | ExprStmt | variables.rs:418:9:418:17 | PathExpr |  |
-| variables.rs:418:19:418:19 | x | variables.rs:418:23:418:23 | 1 |  |
-| variables.rs:418:19:418:23 | ... + ... | variables.rs:418:9:418:24 | CallExpr |  |
-| variables.rs:418:23:418:23 | 1 | variables.rs:418:19:418:23 | ... + ... |  |
-| variables.rs:420:5:420:13 | PathExpr | variables.rs:420:15:420:15 | x |  |
-| variables.rs:420:5:420:16 | CallExpr | variables.rs:407:18:421:1 | BlockExpr |  |
-| variables.rs:420:5:420:17 | ExprStmt | variables.rs:420:5:420:13 | PathExpr |  |
-| variables.rs:420:15:420:15 | x | variables.rs:420:5:420:16 | CallExpr |  |
-| variables.rs:423:1:436:1 | enter phi_read | variables.rs:423:13:423:14 | b1 |  |
-| variables.rs:423:1:436:1 | exit phi_read (normal) | variables.rs:423:1:436:1 | exit phi_read |  |
-| variables.rs:423:13:423:14 | b1 | variables.rs:423:13:423:21 | Param | match |
-| variables.rs:423:13:423:21 | Param | variables.rs:423:24:423:25 | b2 |  |
-| variables.rs:423:24:423:25 | b2 | variables.rs:423:24:423:32 | Param | match |
-| variables.rs:423:24:423:32 | Param | variables.rs:424:5:424:14 | LetStmt |  |
-| variables.rs:423:35:436:1 | BlockExpr | variables.rs:423:1:436:1 | exit phi_read (normal) |  |
-| variables.rs:424:5:424:14 | LetStmt | variables.rs:424:13:424:13 | 1 |  |
-| variables.rs:424:9:424:9 | x | variables.rs:425:5:429:5 | ExprStmt | match |
-| variables.rs:424:13:424:13 | 1 | variables.rs:424:9:424:9 | x |  |
-| variables.rs:425:5:429:5 | ExprStmt | variables.rs:425:8:425:9 | b1 |  |
-| variables.rs:425:5:429:5 | IfExpr | variables.rs:431:8:431:9 | b2 |  |
-| variables.rs:425:8:425:9 | b1 | variables.rs:426:9:426:21 | ExprStmt | true |
-| variables.rs:425:8:425:9 | b1 | variables.rs:428:9:428:21 | ExprStmt | false |
-| variables.rs:425:11:427:5 | BlockExpr | variables.rs:425:5:429:5 | IfExpr |  |
-| variables.rs:426:9:426:17 | PathExpr | variables.rs:426:19:426:19 | x |  |
-| variables.rs:426:9:426:20 | CallExpr | variables.rs:425:11:427:5 | BlockExpr |  |
-| variables.rs:426:9:426:21 | ExprStmt | variables.rs:426:9:426:17 | PathExpr |  |
-| variables.rs:426:19:426:19 | x | variables.rs:426:9:426:20 | CallExpr |  |
-| variables.rs:427:12:429:5 | BlockExpr | variables.rs:425:5:429:5 | IfExpr |  |
-| variables.rs:428:9:428:17 | PathExpr | variables.rs:428:19:428:19 | x |  |
-| variables.rs:428:9:428:20 | CallExpr | variables.rs:427:12:429:5 | BlockExpr |  |
-| variables.rs:428:9:428:21 | ExprStmt | variables.rs:428:9:428:17 | PathExpr |  |
-| variables.rs:428:19:428:19 | x | variables.rs:428:9:428:20 | CallExpr |  |
-| variables.rs:431:5:435:5 | IfExpr | variables.rs:423:35:436:1 | BlockExpr |  |
-| variables.rs:431:8:431:9 | b2 | variables.rs:432:9:432:21 | ExprStmt | true |
-| variables.rs:431:8:431:9 | b2 | variables.rs:434:9:434:21 | ExprStmt | false |
-| variables.rs:431:11:433:5 | BlockExpr | variables.rs:431:5:435:5 | IfExpr |  |
-| variables.rs:432:9:432:17 | PathExpr | variables.rs:432:19:432:19 | x |  |
-| variables.rs:432:9:432:20 | CallExpr | variables.rs:431:11:433:5 | BlockExpr |  |
-| variables.rs:432:9:432:21 | ExprStmt | variables.rs:432:9:432:17 | PathExpr |  |
-| variables.rs:432:19:432:19 | x | variables.rs:432:9:432:20 | CallExpr |  |
-| variables.rs:433:12:435:5 | BlockExpr | variables.rs:431:5:435:5 | IfExpr |  |
-| variables.rs:434:9:434:17 | PathExpr | variables.rs:434:19:434:19 | x |  |
-| variables.rs:434:9:434:20 | CallExpr | variables.rs:433:12:435:5 | BlockExpr |  |
-| variables.rs:434:9:434:21 | ExprStmt | variables.rs:434:9:434:17 | PathExpr |  |
-| variables.rs:434:19:434:19 | x | variables.rs:434:9:434:20 | CallExpr |  |
-| variables.rs:444:5:446:5 | enter my_get | variables.rs:445:9:445:24 | ExprStmt |  |
-| variables.rs:444:5:446:5 | exit my_get (normal) | variables.rs:444:5:446:5 | exit my_get |  |
-| variables.rs:445:9:445:23 | ReturnExpr | variables.rs:444:5:446:5 | exit my_get (normal) | return |
-| variables.rs:445:9:445:24 | ExprStmt | variables.rs:445:16:445:19 | PathExpr |  |
-| variables.rs:445:16:445:19 | PathExpr | variables.rs:445:16:445:23 | FieldExpr |  |
-| variables.rs:445:16:445:23 | FieldExpr | variables.rs:445:9:445:23 | ReturnExpr |  |
-| variables.rs:449:1:456:1 | enter structs | variables.rs:450:5:450:36 | LetStmt |  |
-| variables.rs:449:1:456:1 | exit structs (normal) | variables.rs:449:1:456:1 | exit structs |  |
-| variables.rs:449:14:456:1 | BlockExpr | variables.rs:449:1:456:1 | exit structs (normal) |  |
-| variables.rs:450:5:450:36 | LetStmt | variables.rs:450:33:450:33 | 1 |  |
-| variables.rs:450:9:450:13 | a | variables.rs:451:5:451:26 | ExprStmt | match |
-| variables.rs:450:17:450:35 | RecordExpr | variables.rs:450:9:450:13 | a |  |
-| variables.rs:450:33:450:33 | 1 | variables.rs:450:17:450:35 | RecordExpr |  |
-| variables.rs:451:5:451:13 | PathExpr | variables.rs:451:15:451:15 | a |  |
-| variables.rs:451:5:451:25 | CallExpr | variables.rs:452:5:452:14 | ExprStmt |  |
-| variables.rs:451:5:451:26 | ExprStmt | variables.rs:451:5:451:13 | PathExpr |  |
-| variables.rs:451:15:451:15 | a | variables.rs:451:15:451:24 | MethodCallExpr |  |
-| variables.rs:451:15:451:24 | MethodCallExpr | variables.rs:451:5:451:25 | CallExpr |  |
-| variables.rs:452:5:452:5 | a | variables.rs:452:5:452:9 | FieldExpr |  |
-| variables.rs:452:5:452:9 | FieldExpr | variables.rs:452:13:452:13 | 5 |  |
-| variables.rs:452:5:452:13 | ... = ... | variables.rs:453:5:453:26 | ExprStmt |  |
-| variables.rs:452:5:452:14 | ExprStmt | variables.rs:452:5:452:5 | a |  |
-| variables.rs:452:13:452:13 | 5 | variables.rs:452:5:452:13 | ... = ... |  |
-| variables.rs:453:5:453:13 | PathExpr | variables.rs:453:15:453:15 | a |  |
-| variables.rs:453:5:453:25 | CallExpr | variables.rs:454:5:454:28 | ExprStmt |  |
-| variables.rs:453:5:453:26 | ExprStmt | variables.rs:453:5:453:13 | PathExpr |  |
-| variables.rs:453:15:453:15 | a | variables.rs:453:15:453:24 | MethodCallExpr |  |
-| variables.rs:453:15:453:24 | MethodCallExpr | variables.rs:453:5:453:25 | CallExpr |  |
-| variables.rs:454:5:454:5 | a | variables.rs:454:25:454:25 | 2 |  |
-| variables.rs:454:5:454:27 | ... = ... | variables.rs:455:5:455:26 | ExprStmt |  |
-| variables.rs:454:5:454:28 | ExprStmt | variables.rs:454:5:454:5 | a |  |
-| variables.rs:454:9:454:27 | RecordExpr | variables.rs:454:5:454:27 | ... = ... |  |
-| variables.rs:454:25:454:25 | 2 | variables.rs:454:9:454:27 | RecordExpr |  |
-| variables.rs:455:5:455:13 | PathExpr | variables.rs:455:15:455:15 | a |  |
-| variables.rs:455:5:455:25 | CallExpr | variables.rs:449:14:456:1 | BlockExpr |  |
-| variables.rs:455:5:455:26 | ExprStmt | variables.rs:455:5:455:13 | PathExpr |  |
-| variables.rs:455:15:455:15 | a | variables.rs:455:15:455:24 | MethodCallExpr |  |
-| variables.rs:455:15:455:24 | MethodCallExpr | variables.rs:455:5:455:25 | CallExpr |  |
-| variables.rs:458:1:460:1 | enter ref_param | variables.rs:458:14:458:14 | x |  |
-| variables.rs:458:1:460:1 | exit ref_param (normal) | variables.rs:458:1:460:1 | exit ref_param |  |
-| variables.rs:458:14:458:14 | x | variables.rs:458:14:458:20 | Param | match |
-| variables.rs:458:14:458:20 | Param | variables.rs:459:5:459:13 | PathExpr |  |
-| variables.rs:458:23:460:1 | BlockExpr | variables.rs:458:1:460:1 | exit ref_param (normal) |  |
-| variables.rs:459:5:459:13 | PathExpr | variables.rs:459:16:459:16 | x |  |
-| variables.rs:459:5:459:17 | CallExpr | variables.rs:458:23:460:1 | BlockExpr |  |
-| variables.rs:459:15:459:16 | * ... | variables.rs:459:5:459:17 | CallExpr |  |
-| variables.rs:459:16:459:16 | x | variables.rs:459:15:459:16 | * ... |  |
-| variables.rs:462:1:469:1 | enter ref_arg | variables.rs:463:5:463:15 | LetStmt |  |
-| variables.rs:462:1:469:1 | exit ref_arg (normal) | variables.rs:462:1:469:1 | exit ref_arg |  |
-| variables.rs:462:14:469:1 | BlockExpr | variables.rs:462:1:469:1 | exit ref_arg (normal) |  |
-| variables.rs:463:5:463:15 | LetStmt | variables.rs:463:13:463:14 | 16 |  |
-| variables.rs:463:9:463:9 | x | variables.rs:464:5:464:18 | ExprStmt | match |
-| variables.rs:463:13:463:14 | 16 | variables.rs:463:9:463:9 | x |  |
-| variables.rs:464:5:464:13 | PathExpr | variables.rs:464:16:464:16 | x |  |
-| variables.rs:464:5:464:17 | CallExpr | variables.rs:465:5:465:17 | ExprStmt |  |
-| variables.rs:464:5:464:18 | ExprStmt | variables.rs:464:5:464:13 | PathExpr |  |
-| variables.rs:464:15:464:16 | RefExpr | variables.rs:464:5:464:17 | CallExpr |  |
-| variables.rs:464:16:464:16 | x | variables.rs:464:15:464:16 | RefExpr |  |
-| variables.rs:465:5:465:13 | PathExpr | variables.rs:465:15:465:15 | x |  |
-| variables.rs:465:5:465:16 | CallExpr | variables.rs:467:5:467:15 | LetStmt |  |
-| variables.rs:465:5:465:17 | ExprStmt | variables.rs:465:5:465:13 | PathExpr |  |
-| variables.rs:465:15:465:15 | x | variables.rs:465:5:465:16 | CallExpr |  |
-| variables.rs:467:5:467:15 | LetStmt | variables.rs:467:13:467:14 | 17 |  |
-| variables.rs:467:9:467:9 | z | variables.rs:468:5:468:18 | ExprStmt | match |
-| variables.rs:467:13:467:14 | 17 | variables.rs:467:9:467:9 | z |  |
-| variables.rs:468:5:468:13 | PathExpr | variables.rs:468:16:468:16 | z |  |
-| variables.rs:468:5:468:17 | CallExpr | variables.rs:462:14:469:1 | BlockExpr |  |
-| variables.rs:468:5:468:18 | ExprStmt | variables.rs:468:5:468:13 | PathExpr |  |
-| variables.rs:468:15:468:16 | RefExpr | variables.rs:468:5:468:17 | CallExpr |  |
-| variables.rs:468:16:468:16 | z | variables.rs:468:15:468:16 | RefExpr |  |
-| variables.rs:476:3:478:3 | enter bar | variables.rs:477:5:477:32 | ExprStmt |  |
-| variables.rs:476:3:478:3 | exit bar (normal) | variables.rs:476:3:478:3 | exit bar |  |
-| variables.rs:476:21:478:3 | BlockExpr | variables.rs:476:3:478:3 | exit bar (normal) |  |
-| variables.rs:477:5:477:9 | * ... | variables.rs:477:29:477:29 | 3 |  |
-| variables.rs:477:5:477:31 | ... = ... | variables.rs:476:21:478:3 | BlockExpr |  |
-| variables.rs:477:5:477:32 | ExprStmt | variables.rs:477:6:477:9 | PathExpr |  |
-| variables.rs:477:6:477:9 | PathExpr | variables.rs:477:5:477:9 | * ... |  |
-| variables.rs:477:13:477:31 | RecordExpr | variables.rs:477:5:477:31 | ... = ... |  |
-| variables.rs:477:29:477:29 | 3 | variables.rs:477:13:477:31 | RecordExpr |  |
-| variables.rs:481:1:486:1 | enter ref_methodcall_receiver | variables.rs:482:3:482:34 | LetStmt |  |
-| variables.rs:481:1:486:1 | exit ref_methodcall_receiver (normal) | variables.rs:481:1:486:1 | exit ref_methodcall_receiver |  |
-| variables.rs:481:30:486:1 | BlockExpr | variables.rs:481:1:486:1 | exit ref_methodcall_receiver (normal) |  |
-| variables.rs:482:3:482:34 | LetStmt | variables.rs:482:31:482:31 | 1 |  |
-| variables.rs:482:7:482:11 | a | variables.rs:483:3:483:10 | ExprStmt | match |
-| variables.rs:482:15:482:33 | RecordExpr | variables.rs:482:7:482:11 | a |  |
-| variables.rs:482:31:482:31 | 1 | variables.rs:482:15:482:33 | RecordExpr |  |
-| variables.rs:483:3:483:3 | a | variables.rs:483:3:483:9 | MethodCallExpr |  |
-| variables.rs:483:3:483:9 | MethodCallExpr | variables.rs:485:3:485:19 | ExprStmt |  |
-| variables.rs:483:3:483:10 | ExprStmt | variables.rs:483:3:483:3 | a |  |
-| variables.rs:485:3:485:11 | PathExpr | variables.rs:485:13:485:13 | a |  |
-| variables.rs:485:3:485:18 | CallExpr | variables.rs:481:30:486:1 | BlockExpr |  |
-| variables.rs:485:3:485:19 | ExprStmt | variables.rs:485:3:485:11 | PathExpr |  |
-| variables.rs:485:13:485:13 | a | variables.rs:485:13:485:17 | FieldExpr |  |
-| variables.rs:485:13:485:17 | FieldExpr | variables.rs:485:3:485:18 | CallExpr |  |
-| variables.rs:488:1:520:1 | enter main | variables.rs:489:5:489:25 | ExprStmt |  |
-| variables.rs:488:1:520:1 | exit main (normal) | variables.rs:488:1:520:1 | exit main |  |
-| variables.rs:488:11:520:1 | BlockExpr | variables.rs:488:1:520:1 | exit main (normal) |  |
-| variables.rs:489:5:489:22 | PathExpr | variables.rs:489:5:489:24 | CallExpr |  |
-| variables.rs:489:5:489:24 | CallExpr | variables.rs:490:5:490:23 | ExprStmt |  |
-| variables.rs:489:5:489:25 | ExprStmt | variables.rs:489:5:489:22 | PathExpr |  |
-| variables.rs:490:5:490:20 | PathExpr | variables.rs:490:5:490:22 | CallExpr |  |
-| variables.rs:490:5:490:22 | CallExpr | variables.rs:491:5:491:23 | ExprStmt |  |
-| variables.rs:490:5:490:23 | ExprStmt | variables.rs:490:5:490:20 | PathExpr |  |
-| variables.rs:491:5:491:20 | PathExpr | variables.rs:491:5:491:22 | CallExpr |  |
-| variables.rs:491:5:491:22 | CallExpr | variables.rs:492:5:492:23 | ExprStmt |  |
-| variables.rs:491:5:491:23 | ExprStmt | variables.rs:491:5:491:20 | PathExpr |  |
-| variables.rs:492:5:492:20 | PathExpr | variables.rs:492:5:492:22 | CallExpr |  |
-| variables.rs:492:5:492:22 | CallExpr | variables.rs:493:5:493:19 | ExprStmt |  |
-| variables.rs:492:5:492:23 | ExprStmt | variables.rs:492:5:492:20 | PathExpr |  |
-| variables.rs:493:5:493:16 | PathExpr | variables.rs:493:5:493:18 | CallExpr |  |
-| variables.rs:493:5:493:18 | CallExpr | variables.rs:494:5:494:19 | ExprStmt |  |
-| variables.rs:493:5:493:19 | ExprStmt | variables.rs:493:5:493:16 | PathExpr |  |
-| variables.rs:494:5:494:16 | PathExpr | variables.rs:494:5:494:18 | CallExpr |  |
-| variables.rs:494:5:494:18 | CallExpr | variables.rs:495:5:495:19 | ExprStmt |  |
-| variables.rs:494:5:494:19 | ExprStmt | variables.rs:494:5:494:16 | PathExpr |  |
-| variables.rs:495:5:495:16 | PathExpr | variables.rs:495:5:495:18 | CallExpr |  |
-| variables.rs:495:5:495:18 | CallExpr | variables.rs:496:5:496:19 | ExprStmt |  |
-| variables.rs:495:5:495:19 | ExprStmt | variables.rs:495:5:495:16 | PathExpr |  |
-| variables.rs:496:5:496:16 | PathExpr | variables.rs:496:5:496:18 | CallExpr |  |
-| variables.rs:496:5:496:18 | CallExpr | variables.rs:497:5:497:21 | ExprStmt |  |
-| variables.rs:496:5:496:19 | ExprStmt | variables.rs:496:5:496:16 | PathExpr |  |
-| variables.rs:497:5:497:18 | PathExpr | variables.rs:497:5:497:20 | CallExpr |  |
-| variables.rs:497:5:497:20 | CallExpr | variables.rs:498:5:498:21 | ExprStmt |  |
-| variables.rs:497:5:497:21 | ExprStmt | variables.rs:497:5:497:18 | PathExpr |  |
-| variables.rs:498:5:498:18 | PathExpr | variables.rs:498:5:498:20 | CallExpr |  |
-| variables.rs:498:5:498:20 | CallExpr | variables.rs:499:5:499:21 | ExprStmt |  |
-| variables.rs:498:5:498:21 | ExprStmt | variables.rs:498:5:498:18 | PathExpr |  |
-| variables.rs:499:5:499:18 | PathExpr | variables.rs:499:5:499:20 | CallExpr |  |
-| variables.rs:499:5:499:20 | CallExpr | variables.rs:500:5:500:21 | ExprStmt |  |
-| variables.rs:499:5:499:21 | ExprStmt | variables.rs:499:5:499:18 | PathExpr |  |
-| variables.rs:500:5:500:18 | PathExpr | variables.rs:500:5:500:20 | CallExpr |  |
-| variables.rs:500:5:500:20 | CallExpr | variables.rs:501:5:501:21 | ExprStmt |  |
-| variables.rs:500:5:500:21 | ExprStmt | variables.rs:500:5:500:18 | PathExpr |  |
-| variables.rs:501:5:501:18 | PathExpr | variables.rs:501:5:501:20 | CallExpr |  |
-| variables.rs:501:5:501:20 | CallExpr | variables.rs:502:5:502:21 | ExprStmt |  |
-| variables.rs:501:5:501:21 | ExprStmt | variables.rs:501:5:501:18 | PathExpr |  |
-| variables.rs:502:5:502:18 | PathExpr | variables.rs:502:5:502:20 | CallExpr |  |
-| variables.rs:502:5:502:20 | CallExpr | variables.rs:503:5:503:21 | ExprStmt |  |
-| variables.rs:502:5:502:21 | ExprStmt | variables.rs:502:5:502:18 | PathExpr |  |
-| variables.rs:503:5:503:18 | PathExpr | variables.rs:503:5:503:20 | CallExpr |  |
-| variables.rs:503:5:503:20 | CallExpr | variables.rs:504:5:504:21 | ExprStmt |  |
-| variables.rs:503:5:503:21 | ExprStmt | variables.rs:503:5:503:18 | PathExpr |  |
-| variables.rs:504:5:504:18 | PathExpr | variables.rs:504:5:504:20 | CallExpr |  |
-| variables.rs:504:5:504:20 | CallExpr | variables.rs:505:5:505:21 | ExprStmt |  |
-| variables.rs:504:5:504:21 | ExprStmt | variables.rs:504:5:504:18 | PathExpr |  |
-| variables.rs:505:5:505:18 | PathExpr | variables.rs:505:5:505:20 | CallExpr |  |
-| variables.rs:505:5:505:20 | CallExpr | variables.rs:506:5:506:36 | ExprStmt |  |
-| variables.rs:505:5:505:21 | ExprStmt | variables.rs:505:5:505:18 | PathExpr |  |
-| variables.rs:506:5:506:18 | PathExpr | variables.rs:506:20:506:22 | "a" |  |
-| variables.rs:506:5:506:35 | CallExpr | variables.rs:507:5:507:37 | ExprStmt |  |
-| variables.rs:506:5:506:36 | ExprStmt | variables.rs:506:5:506:18 | PathExpr |  |
-| variables.rs:506:20:506:22 | "a" | variables.rs:506:26:506:28 | "b" |  |
-| variables.rs:506:25:506:34 | TupleExpr | variables.rs:506:5:506:35 | CallExpr |  |
-| variables.rs:506:26:506:28 | "b" | variables.rs:506:31:506:33 | "c" |  |
-| variables.rs:506:31:506:33 | "c" | variables.rs:506:25:506:34 | TupleExpr |  |
-| variables.rs:507:5:507:18 | PathExpr | variables.rs:507:20:507:31 | PathExpr |  |
-| variables.rs:507:5:507:36 | CallExpr | variables.rs:508:5:508:26 | ExprStmt |  |
-| variables.rs:507:5:507:37 | ExprStmt | variables.rs:507:5:507:18 | PathExpr |  |
-| variables.rs:507:20:507:31 | PathExpr | variables.rs:507:33:507:34 | 45 |  |
-| variables.rs:507:20:507:35 | CallExpr | variables.rs:507:5:507:36 | CallExpr |  |
-| variables.rs:507:33:507:34 | 45 | variables.rs:507:20:507:35 | CallExpr |  |
-| variables.rs:508:5:508:23 | PathExpr | variables.rs:508:5:508:25 | CallExpr |  |
-| variables.rs:508:5:508:25 | CallExpr | variables.rs:509:5:509:23 | ExprStmt |  |
-| variables.rs:508:5:508:26 | ExprStmt | variables.rs:508:5:508:23 | PathExpr |  |
-| variables.rs:509:5:509:20 | PathExpr | variables.rs:509:5:509:22 | CallExpr |  |
-| variables.rs:509:5:509:22 | CallExpr | variables.rs:510:5:510:19 | ExprStmt |  |
-| variables.rs:509:5:509:23 | ExprStmt | variables.rs:509:5:509:20 | PathExpr |  |
-| variables.rs:510:5:510:16 | PathExpr | variables.rs:510:5:510:18 | CallExpr |  |
-| variables.rs:510:5:510:18 | CallExpr | variables.rs:511:5:511:17 | ExprStmt |  |
-| variables.rs:510:5:510:19 | ExprStmt | variables.rs:510:5:510:16 | PathExpr |  |
-| variables.rs:511:5:511:14 | PathExpr | variables.rs:511:5:511:16 | CallExpr |  |
-| variables.rs:511:5:511:16 | CallExpr | variables.rs:512:5:512:13 | ExprStmt |  |
-| variables.rs:511:5:511:17 | ExprStmt | variables.rs:511:5:511:14 | PathExpr |  |
-| variables.rs:512:5:512:10 | PathExpr | variables.rs:512:5:512:12 | CallExpr |  |
-| variables.rs:512:5:512:12 | CallExpr | variables.rs:513:5:513:17 | ExprStmt |  |
-| variables.rs:512:5:512:13 | ExprStmt | variables.rs:512:5:512:10 | PathExpr |  |
-| variables.rs:513:5:513:14 | PathExpr | variables.rs:513:5:513:16 | CallExpr |  |
-| variables.rs:513:5:513:16 | CallExpr | variables.rs:514:5:514:12 | ExprStmt |  |
-| variables.rs:513:5:513:17 | ExprStmt | variables.rs:513:5:513:14 | PathExpr |  |
-| variables.rs:514:5:514:9 | PathExpr | variables.rs:514:5:514:11 | CallExpr |  |
-| variables.rs:514:5:514:11 | CallExpr | variables.rs:515:5:515:18 | ExprStmt |  |
-| variables.rs:514:5:514:12 | ExprStmt | variables.rs:514:5:514:9 | PathExpr |  |
-| variables.rs:515:5:515:15 | PathExpr | variables.rs:515:5:515:17 | CallExpr |  |
-| variables.rs:515:5:515:17 | CallExpr | variables.rs:516:5:516:20 | ExprStmt |  |
-| variables.rs:515:5:515:18 | ExprStmt | variables.rs:515:5:515:15 | PathExpr |  |
-| variables.rs:516:5:516:17 | PathExpr | variables.rs:516:5:516:19 | CallExpr |  |
-| variables.rs:516:5:516:19 | CallExpr | variables.rs:517:5:517:14 | ExprStmt |  |
-| variables.rs:516:5:516:20 | ExprStmt | variables.rs:516:5:516:17 | PathExpr |  |
-| variables.rs:517:5:517:11 | PathExpr | variables.rs:517:5:517:13 | CallExpr |  |
-| variables.rs:517:5:517:13 | CallExpr | variables.rs:518:5:518:14 | ExprStmt |  |
-| variables.rs:517:5:517:14 | ExprStmt | variables.rs:517:5:517:11 | PathExpr |  |
-| variables.rs:518:5:518:11 | PathExpr | variables.rs:518:5:518:13 | CallExpr |  |
-| variables.rs:518:5:518:13 | CallExpr | variables.rs:519:5:519:30 | ExprStmt |  |
-| variables.rs:518:5:518:14 | ExprStmt | variables.rs:518:5:518:11 | PathExpr |  |
-| variables.rs:519:5:519:27 | PathExpr | variables.rs:519:5:519:29 | CallExpr |  |
-| variables.rs:519:5:519:29 | CallExpr | variables.rs:488:11:520:1 | BlockExpr |  |
-| variables.rs:519:5:519:30 | ExprStmt | variables.rs:519:5:519:27 | PathExpr |  |
+| 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 | PathExpr | 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 | PathExpr |  |
+| 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 | PathExpr | 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 | PathExpr |  |
+| 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 | MethodCallExpr | 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 | MethodCallExpr |  |
+| 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 | PathExpr | 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 | PathExpr |  |
+| variables.rs:432:15:432:15 | z | variables.rs:432:5:432:16 | CallExpr |  |
+| variables.rs:435:1:449:1 | enter phi | variables.rs:435:8:435:8 | b |  |
+| variables.rs:435:1:449:1 | exit phi (normal) | variables.rs:435:1:449:1 | exit phi |  |
+| variables.rs:435:8:435:8 | b | variables.rs:435:8:435:15 | Param | match |
+| variables.rs:435:8:435:15 | Param | variables.rs:436:5:436:18 | LetStmt |  |
+| variables.rs:435:18:449:1 | BlockExpr | variables.rs:435:1:449:1 | exit phi (normal) |  |
+| variables.rs:436:5:436:18 | LetStmt | variables.rs:436:17:436:17 | 1 |  |
+| variables.rs:436:9:436:13 | x | variables.rs:437:5:437:17 | ExprStmt | match |
+| variables.rs:436:17:436:17 | 1 | variables.rs:436:9:436:13 | x |  |
+| variables.rs:437:5:437:13 | PathExpr | variables.rs:437:15:437:15 | x |  |
+| variables.rs:437:5:437:16 | CallExpr | variables.rs:438:5:438:21 | ExprStmt |  |
+| variables.rs:437:5:437:17 | ExprStmt | variables.rs:437:5:437:13 | PathExpr |  |
+| variables.rs:437:15:437:15 | x | variables.rs:437:5:437:16 | CallExpr |  |
+| variables.rs:438:5:438:13 | PathExpr | variables.rs:438:15:438:15 | x |  |
+| variables.rs:438:5:438:20 | CallExpr | variables.rs:439:5:447:5 | ExprStmt |  |
+| variables.rs:438:5:438:21 | ExprStmt | variables.rs:438:5:438:13 | PathExpr |  |
+| variables.rs:438:15:438:15 | x | variables.rs:438:19:438:19 | 1 |  |
+| variables.rs:438:15:438:19 | ... + ... | variables.rs:438:5:438:20 | CallExpr |  |
+| variables.rs:438:19:438:19 | 1 | variables.rs:438:15:438:19 | ... + ... |  |
+| variables.rs:439:5:447:5 | ExprStmt | variables.rs:439:8:439:8 | b |  |
+| variables.rs:439:5:447:5 | IfExpr | variables.rs:448:5:448:17 | ExprStmt |  |
+| variables.rs:439:8:439:8 | b | variables.rs:440:9:440:14 | ExprStmt | true |
+| variables.rs:439:8:439:8 | b | variables.rs:444:9:444:14 | ExprStmt | false |
+| variables.rs:439:10:443:5 | BlockExpr | variables.rs:439:5:447:5 | IfExpr |  |
+| variables.rs:440:9:440:9 | x | variables.rs:440:13:440:13 | 2 |  |
+| variables.rs:440:9:440:13 | ... = ... | variables.rs:441:9:441:21 | ExprStmt |  |
+| variables.rs:440:9:440:14 | ExprStmt | variables.rs:440:9:440:9 | x |  |
+| variables.rs:440:13:440:13 | 2 | variables.rs:440:9:440:13 | ... = ... |  |
+| variables.rs:441:9:441:17 | PathExpr | variables.rs:441:19:441:19 | x |  |
+| variables.rs:441:9:441:20 | CallExpr | variables.rs:442:9:442:25 | ExprStmt |  |
+| variables.rs:441:9:441:21 | ExprStmt | variables.rs:441:9:441:17 | PathExpr |  |
+| variables.rs:441:19:441:19 | x | variables.rs:441:9:441:20 | CallExpr |  |
+| variables.rs:442:9:442:17 | PathExpr | variables.rs:442:19:442:19 | x |  |
+| variables.rs:442:9:442:24 | CallExpr | variables.rs:439:10:443:5 | BlockExpr |  |
+| variables.rs:442:9:442:25 | ExprStmt | variables.rs:442:9:442:17 | PathExpr |  |
+| variables.rs:442:19:442:19 | x | variables.rs:442:23:442:23 | 1 |  |
+| variables.rs:442:19:442:23 | ... + ... | variables.rs:442:9:442:24 | CallExpr |  |
+| variables.rs:442:23:442:23 | 1 | variables.rs:442:19:442:23 | ... + ... |  |
+| variables.rs:443:12:447:5 | BlockExpr | variables.rs:439:5:447:5 | IfExpr |  |
+| variables.rs:444:9:444:9 | x | variables.rs:444:13:444:13 | 3 |  |
+| variables.rs:444:9:444:13 | ... = ... | variables.rs:445:9:445:21 | ExprStmt |  |
+| variables.rs:444:9:444:14 | ExprStmt | variables.rs:444:9:444:9 | x |  |
+| variables.rs:444:13:444:13 | 3 | variables.rs:444:9:444:13 | ... = ... |  |
+| variables.rs:445:9:445:17 | PathExpr | variables.rs:445:19:445:19 | x |  |
+| variables.rs:445:9:445:20 | CallExpr | variables.rs:446:9:446:25 | ExprStmt |  |
+| variables.rs:445:9:445:21 | ExprStmt | variables.rs:445:9:445:17 | PathExpr |  |
+| variables.rs:445:19:445:19 | x | variables.rs:445:9:445:20 | CallExpr |  |
+| variables.rs:446:9:446:17 | PathExpr | variables.rs:446:19:446:19 | x |  |
+| variables.rs:446:9:446:24 | CallExpr | variables.rs:443:12:447:5 | BlockExpr |  |
+| variables.rs:446:9:446:25 | ExprStmt | variables.rs:446:9:446:17 | PathExpr |  |
+| variables.rs:446:19:446:19 | x | variables.rs:446:23:446:23 | 1 |  |
+| variables.rs:446:19:446:23 | ... + ... | variables.rs:446:9:446:24 | CallExpr |  |
+| variables.rs:446:23:446:23 | 1 | variables.rs:446:19:446:23 | ... + ... |  |
+| variables.rs:448:5:448:13 | PathExpr | variables.rs:448:15:448:15 | x |  |
+| variables.rs:448:5:448:16 | CallExpr | variables.rs:435:18:449:1 | BlockExpr |  |
+| variables.rs:448:5:448:17 | ExprStmt | variables.rs:448:5:448:13 | PathExpr |  |
+| variables.rs:448:15:448:15 | x | variables.rs:448:5:448:16 | CallExpr |  |
+| variables.rs:451:1:464:1 | enter phi_read | variables.rs:451:13:451:14 | b1 |  |
+| variables.rs:451:1:464:1 | exit phi_read (normal) | variables.rs:451:1:464:1 | exit phi_read |  |
+| variables.rs:451:13:451:14 | b1 | variables.rs:451:13:451:21 | Param | match |
+| variables.rs:451:13:451:21 | Param | variables.rs:451:24:451:25 | b2 |  |
+| variables.rs:451:24:451:25 | b2 | variables.rs:451:24:451:32 | Param | match |
+| variables.rs:451:24:451:32 | Param | variables.rs:452:5:452:14 | LetStmt |  |
+| variables.rs:451:35:464:1 | BlockExpr | variables.rs:451:1:464:1 | exit phi_read (normal) |  |
+| variables.rs:452:5:452:14 | LetStmt | variables.rs:452:13:452:13 | 1 |  |
+| variables.rs:452:9:452:9 | x | variables.rs:453:5:457:5 | ExprStmt | match |
+| variables.rs:452:13:452:13 | 1 | variables.rs:452:9:452:9 | x |  |
+| variables.rs:453:5:457:5 | ExprStmt | variables.rs:453:8:453:9 | b1 |  |
+| variables.rs:453:5:457:5 | IfExpr | variables.rs:459:8:459:9 | b2 |  |
+| variables.rs:453:8:453:9 | b1 | variables.rs:454:9:454:21 | ExprStmt | true |
+| variables.rs:453:8:453:9 | b1 | variables.rs:456:9:456:21 | ExprStmt | false |
+| variables.rs:453:11:455:5 | BlockExpr | variables.rs:453:5:457:5 | IfExpr |  |
+| variables.rs:454:9:454:17 | PathExpr | variables.rs:454:19:454:19 | x |  |
+| variables.rs:454:9:454:20 | CallExpr | variables.rs:453:11:455:5 | BlockExpr |  |
+| variables.rs:454:9:454:21 | ExprStmt | variables.rs:454:9:454:17 | PathExpr |  |
+| variables.rs:454:19:454:19 | x | variables.rs:454:9:454:20 | CallExpr |  |
+| variables.rs:455:12:457:5 | BlockExpr | variables.rs:453:5:457:5 | IfExpr |  |
+| variables.rs:456:9:456:17 | PathExpr | variables.rs:456:19:456:19 | x |  |
+| variables.rs:456:9:456:20 | CallExpr | variables.rs:455:12:457:5 | BlockExpr |  |
+| variables.rs:456:9:456:21 | ExprStmt | variables.rs:456:9:456:17 | PathExpr |  |
+| variables.rs:456:19:456:19 | x | variables.rs:456:9:456:20 | CallExpr |  |
+| variables.rs:459:5:463:5 | IfExpr | variables.rs:451:35:464:1 | BlockExpr |  |
+| variables.rs:459:8:459:9 | b2 | variables.rs:460:9:460:21 | ExprStmt | true |
+| variables.rs:459:8:459:9 | b2 | variables.rs:462:9:462:21 | ExprStmt | false |
+| variables.rs:459:11:461:5 | BlockExpr | variables.rs:459:5:463:5 | IfExpr |  |
+| variables.rs:460:9:460:17 | PathExpr | variables.rs:460:19:460:19 | x |  |
+| variables.rs:460:9:460:20 | CallExpr | variables.rs:459:11:461:5 | BlockExpr |  |
+| variables.rs:460:9:460:21 | ExprStmt | variables.rs:460:9:460:17 | PathExpr |  |
+| variables.rs:460:19:460:19 | x | variables.rs:460:9:460:20 | CallExpr |  |
+| variables.rs:461:12:463:5 | BlockExpr | variables.rs:459:5:463:5 | IfExpr |  |
+| variables.rs:462:9:462:17 | PathExpr | variables.rs:462:19:462:19 | x |  |
+| variables.rs:462:9:462:20 | CallExpr | variables.rs:461:12:463:5 | BlockExpr |  |
+| variables.rs:462:9:462:21 | ExprStmt | variables.rs:462:9:462:17 | PathExpr |  |
+| variables.rs:462:19:462:19 | x | variables.rs:462:9:462:20 | CallExpr |  |
+| variables.rs:472:5:474:5 | enter my_get | variables.rs:473:9:473:24 | ExprStmt |  |
+| variables.rs:472:5:474:5 | exit my_get (normal) | variables.rs:472:5:474:5 | exit my_get |  |
+| variables.rs:473:9:473:23 | ReturnExpr | variables.rs:472:5:474:5 | exit my_get (normal) | return |
+| variables.rs:473:9:473:24 | ExprStmt | variables.rs:473:16:473:19 | PathExpr |  |
+| variables.rs:473:16:473:19 | PathExpr | variables.rs:473:16:473:23 | FieldExpr |  |
+| variables.rs:473:16:473:23 | FieldExpr | variables.rs:473:9:473:23 | ReturnExpr |  |
+| variables.rs:477:1:484:1 | enter structs | variables.rs:478:5:478:36 | LetStmt |  |
+| variables.rs:477:1:484:1 | exit structs (normal) | variables.rs:477:1:484:1 | exit structs |  |
+| variables.rs:477:14:484:1 | BlockExpr | variables.rs:477:1:484:1 | exit structs (normal) |  |
+| variables.rs:478:5:478:36 | LetStmt | variables.rs:478:33:478:33 | 1 |  |
+| variables.rs:478:9:478:13 | a | variables.rs:479:5:479:26 | ExprStmt | match |
+| variables.rs:478:17:478:35 | RecordExpr | variables.rs:478:9:478:13 | a |  |
+| variables.rs:478:33:478:33 | 1 | variables.rs:478:17:478:35 | RecordExpr |  |
+| variables.rs:479:5:479:13 | PathExpr | variables.rs:479:15:479:15 | a |  |
+| variables.rs:479:5:479:25 | CallExpr | variables.rs:480:5:480:14 | ExprStmt |  |
+| variables.rs:479:5:479:26 | ExprStmt | variables.rs:479:5:479:13 | PathExpr |  |
+| variables.rs:479:15:479:15 | a | variables.rs:479:15:479:24 | MethodCallExpr |  |
+| variables.rs:479:15:479:24 | MethodCallExpr | variables.rs:479:5:479:25 | CallExpr |  |
+| variables.rs:480:5:480:5 | a | variables.rs:480:5:480:9 | FieldExpr |  |
+| variables.rs:480:5:480:9 | FieldExpr | variables.rs:480:13:480:13 | 5 |  |
+| variables.rs:480:5:480:13 | ... = ... | variables.rs:481:5:481:26 | ExprStmt |  |
+| variables.rs:480:5:480:14 | ExprStmt | variables.rs:480:5:480:5 | a |  |
+| variables.rs:480:13:480:13 | 5 | variables.rs:480:5:480:13 | ... = ... |  |
+| variables.rs:481:5:481:13 | PathExpr | variables.rs:481:15:481:15 | a |  |
+| variables.rs:481:5:481:25 | CallExpr | variables.rs:482:5:482:28 | ExprStmt |  |
+| variables.rs:481:5:481:26 | ExprStmt | variables.rs:481:5:481:13 | PathExpr |  |
+| variables.rs:481:15:481:15 | a | variables.rs:481:15:481:24 | MethodCallExpr |  |
+| variables.rs:481:15:481:24 | MethodCallExpr | variables.rs:481:5:481:25 | CallExpr |  |
+| variables.rs:482:5:482:5 | a | variables.rs:482:25:482:25 | 2 |  |
+| variables.rs:482:5:482:27 | ... = ... | variables.rs:483:5:483:26 | ExprStmt |  |
+| variables.rs:482:5:482:28 | ExprStmt | variables.rs:482:5:482:5 | a |  |
+| variables.rs:482:9:482:27 | RecordExpr | variables.rs:482:5:482:27 | ... = ... |  |
+| variables.rs:482:25:482:25 | 2 | variables.rs:482:9:482:27 | RecordExpr |  |
+| variables.rs:483:5:483:13 | PathExpr | variables.rs:483:15:483:15 | a |  |
+| variables.rs:483:5:483:25 | CallExpr | variables.rs:477:14:484:1 | BlockExpr |  |
+| variables.rs:483:5:483:26 | ExprStmt | variables.rs:483:5:483:13 | PathExpr |  |
+| variables.rs:483:15:483:15 | a | variables.rs:483:15:483:24 | MethodCallExpr |  |
+| variables.rs:483:15:483:24 | MethodCallExpr | variables.rs:483:5:483:25 | CallExpr |  |
+| variables.rs:486:1:493:1 | enter ref_arg | variables.rs:487:5:487:15 | LetStmt |  |
+| variables.rs:486:1:493:1 | exit ref_arg (normal) | variables.rs:486:1:493:1 | exit ref_arg |  |
+| variables.rs:486:14:493:1 | BlockExpr | variables.rs:486:1:493:1 | exit ref_arg (normal) |  |
+| variables.rs:487:5:487:15 | LetStmt | variables.rs:487:13:487:14 | 16 |  |
+| variables.rs:487:9:487:9 | x | variables.rs:488:5:488:22 | ExprStmt | match |
+| variables.rs:487:13:487:14 | 16 | variables.rs:487:9:487:9 | x |  |
+| variables.rs:488:5:488:17 | PathExpr | variables.rs:488:20:488:20 | x |  |
+| variables.rs:488:5:488:21 | CallExpr | variables.rs:489:5:489:17 | ExprStmt |  |
+| variables.rs:488:5:488:22 | ExprStmt | variables.rs:488:5:488:17 | PathExpr |  |
+| variables.rs:488:19:488:20 | RefExpr | variables.rs:488:5:488:21 | CallExpr |  |
+| variables.rs:488:20:488:20 | x | variables.rs:488:19:488:20 | RefExpr |  |
+| variables.rs:489:5:489:13 | PathExpr | variables.rs:489:15:489:15 | x |  |
+| variables.rs:489:5:489:16 | CallExpr | variables.rs:491:5:491:15 | LetStmt |  |
+| variables.rs:489:5:489:17 | ExprStmt | variables.rs:489:5:489:13 | PathExpr |  |
+| variables.rs:489:15:489:15 | x | variables.rs:489:5:489:16 | CallExpr |  |
+| variables.rs:491:5:491:15 | LetStmt | variables.rs:491:13:491:14 | 17 |  |
+| variables.rs:491:9:491:9 | z | variables.rs:492:5:492:22 | ExprStmt | match |
+| variables.rs:491:13:491:14 | 17 | variables.rs:491:9:491:9 | z |  |
+| variables.rs:492:5:492:17 | PathExpr | variables.rs:492:20:492:20 | z |  |
+| variables.rs:492:5:492:21 | CallExpr | variables.rs:486:14:493:1 | BlockExpr |  |
+| variables.rs:492:5:492:22 | ExprStmt | variables.rs:492:5:492:17 | PathExpr |  |
+| variables.rs:492:19:492:20 | RefExpr | variables.rs:492:5:492:21 | CallExpr |  |
+| variables.rs:492:20:492:20 | z | variables.rs:492:19:492:20 | RefExpr |  |
+| variables.rs:500:3:502:3 | enter bar | variables.rs:501:5:501:32 | ExprStmt |  |
+| variables.rs:500:3:502:3 | exit bar (normal) | variables.rs:500:3:502:3 | exit bar |  |
+| variables.rs:500:21:502:3 | BlockExpr | variables.rs:500:3:502:3 | exit bar (normal) |  |
+| variables.rs:501:5:501:9 | * ... | variables.rs:501:29:501:29 | 3 |  |
+| variables.rs:501:5:501:31 | ... = ... | variables.rs:500:21:502:3 | BlockExpr |  |
+| variables.rs:501:5:501:32 | ExprStmt | variables.rs:501:6:501:9 | PathExpr |  |
+| variables.rs:501:6:501:9 | PathExpr | variables.rs:501:5:501:9 | * ... |  |
+| variables.rs:501:13:501:31 | RecordExpr | variables.rs:501:5:501:31 | ... = ... |  |
+| variables.rs:501:29:501:29 | 3 | variables.rs:501:13:501:31 | RecordExpr |  |
+| variables.rs:505:1:510:1 | enter ref_methodcall_receiver | variables.rs:506:3:506:34 | LetStmt |  |
+| variables.rs:505:1:510:1 | exit ref_methodcall_receiver (normal) | variables.rs:505:1:510:1 | exit ref_methodcall_receiver |  |
+| variables.rs:505:30:510:1 | BlockExpr | variables.rs:505:1:510:1 | exit ref_methodcall_receiver (normal) |  |
+| variables.rs:506:3:506:34 | LetStmt | variables.rs:506:31:506:31 | 1 |  |
+| variables.rs:506:7:506:11 | a | variables.rs:507:3:507:10 | ExprStmt | match |
+| variables.rs:506:15:506:33 | RecordExpr | variables.rs:506:7:506:11 | a |  |
+| variables.rs:506:31:506:31 | 1 | variables.rs:506:15:506:33 | RecordExpr |  |
+| variables.rs:507:3:507:3 | a | variables.rs:507:3:507:9 | MethodCallExpr |  |
+| variables.rs:507:3:507:9 | MethodCallExpr | variables.rs:509:3:509:19 | ExprStmt |  |
+| variables.rs:507:3:507:10 | ExprStmt | variables.rs:507:3:507:3 | a |  |
+| variables.rs:509:3:509:11 | PathExpr | variables.rs:509:13:509:13 | a |  |
+| variables.rs:509:3:509:18 | CallExpr | variables.rs:505:30:510:1 | BlockExpr |  |
+| variables.rs:509:3:509:19 | ExprStmt | variables.rs:509:3:509:11 | PathExpr |  |
+| variables.rs:509:13:509:13 | a | variables.rs:509:13:509:17 | FieldExpr |  |
+| variables.rs:509:13:509:17 | FieldExpr | variables.rs:509:3:509:18 | CallExpr |  |
+| variables.rs:512:1:545:1 | enter main | variables.rs:513:5:513:25 | ExprStmt |  |
+| variables.rs:512:1:545:1 | exit main (normal) | variables.rs:512:1:545:1 | exit main |  |
+| variables.rs:512:11:545:1 | BlockExpr | variables.rs:512:1:545:1 | exit main (normal) |  |
+| variables.rs:513:5:513:22 | PathExpr | variables.rs:513:5:513:24 | CallExpr |  |
+| variables.rs:513:5:513:24 | CallExpr | variables.rs:514:5:514:23 | ExprStmt |  |
+| variables.rs:513:5:513:25 | ExprStmt | variables.rs:513:5:513:22 | PathExpr |  |
+| variables.rs:514:5:514:20 | PathExpr | variables.rs:514:5:514:22 | CallExpr |  |
+| variables.rs:514:5:514:22 | CallExpr | variables.rs:515:5:515:40 | ExprStmt |  |
+| variables.rs:514:5:514:23 | ExprStmt | variables.rs:514:5:514:20 | PathExpr |  |
+| variables.rs:515:5:515:37 | PathExpr | variables.rs:515:5:515:39 | CallExpr |  |
+| variables.rs:515:5:515:39 | CallExpr | variables.rs:516:5:516:23 | ExprStmt |  |
+| variables.rs:515:5:515:40 | ExprStmt | variables.rs:515:5:515:37 | PathExpr |  |
+| variables.rs:516:5:516:20 | PathExpr | variables.rs:516:5:516:22 | CallExpr |  |
+| variables.rs:516:5:516:22 | CallExpr | variables.rs:517:5:517:23 | ExprStmt |  |
+| variables.rs:516:5:516:23 | ExprStmt | variables.rs:516:5:516:20 | PathExpr |  |
+| variables.rs:517:5:517:20 | PathExpr | variables.rs:517:5:517:22 | CallExpr |  |
+| variables.rs:517:5:517:22 | CallExpr | variables.rs:518:5:518:19 | ExprStmt |  |
+| variables.rs:517:5:517:23 | ExprStmt | variables.rs:517:5:517:20 | PathExpr |  |
+| variables.rs:518:5:518:16 | PathExpr | variables.rs:518:5:518:18 | CallExpr |  |
+| variables.rs:518:5:518:18 | CallExpr | variables.rs:519:5:519:19 | ExprStmt |  |
+| variables.rs:518:5:518:19 | ExprStmt | variables.rs:518:5:518:16 | PathExpr |  |
+| variables.rs:519:5:519:16 | PathExpr | variables.rs:519:5:519:18 | CallExpr |  |
+| variables.rs:519:5:519:18 | CallExpr | variables.rs:520:5:520:19 | ExprStmt |  |
+| variables.rs:519:5:519:19 | ExprStmt | variables.rs:519:5:519:16 | PathExpr |  |
+| variables.rs:520:5:520:16 | PathExpr | variables.rs:520:5:520:18 | CallExpr |  |
+| variables.rs:520:5:520:18 | CallExpr | variables.rs:521:5:521:19 | ExprStmt |  |
+| variables.rs:520:5:520:19 | ExprStmt | variables.rs:520:5:520:16 | PathExpr |  |
+| variables.rs:521:5:521:16 | PathExpr | variables.rs:521:5:521:18 | CallExpr |  |
+| variables.rs:521:5:521:18 | CallExpr | variables.rs:522:5:522:21 | ExprStmt |  |
+| variables.rs:521:5:521:19 | ExprStmt | variables.rs:521:5:521:16 | PathExpr |  |
+| variables.rs:522:5:522:18 | PathExpr | variables.rs:522:5:522:20 | CallExpr |  |
+| variables.rs:522:5:522:20 | CallExpr | variables.rs:523:5:523:21 | ExprStmt |  |
+| variables.rs:522:5:522:21 | ExprStmt | variables.rs:522:5:522:18 | PathExpr |  |
+| variables.rs:523:5:523:18 | PathExpr | variables.rs:523:5:523:20 | CallExpr |  |
+| variables.rs:523:5:523:20 | CallExpr | variables.rs:524:5:524:21 | ExprStmt |  |
+| variables.rs:523:5:523:21 | ExprStmt | variables.rs:523:5:523:18 | PathExpr |  |
+| variables.rs:524:5:524:18 | PathExpr | variables.rs:524:5:524:20 | CallExpr |  |
+| variables.rs:524:5:524:20 | CallExpr | variables.rs:525:5:525:21 | ExprStmt |  |
+| variables.rs:524:5:524:21 | ExprStmt | variables.rs:524:5:524:18 | PathExpr |  |
+| variables.rs:525:5:525:18 | PathExpr | variables.rs:525:5:525:20 | CallExpr |  |
+| variables.rs:525:5:525:20 | CallExpr | variables.rs:526:5:526:21 | ExprStmt |  |
+| variables.rs:525:5:525:21 | ExprStmt | variables.rs:525:5:525:18 | PathExpr |  |
+| variables.rs:526:5:526:18 | PathExpr | variables.rs:526:5:526:20 | CallExpr |  |
+| variables.rs:526:5:526:20 | CallExpr | variables.rs:527:5:527:21 | ExprStmt |  |
+| variables.rs:526:5:526:21 | ExprStmt | variables.rs:526:5:526:18 | PathExpr |  |
+| variables.rs:527:5:527:18 | PathExpr | variables.rs:527:5:527:20 | CallExpr |  |
+| variables.rs:527:5:527:20 | CallExpr | variables.rs:528:5:528:21 | ExprStmt |  |
+| variables.rs:527:5:527:21 | ExprStmt | variables.rs:527:5:527:18 | PathExpr |  |
+| variables.rs:528:5:528:18 | PathExpr | variables.rs:528:5:528:20 | CallExpr |  |
+| variables.rs:528:5:528:20 | CallExpr | variables.rs:529:5:529:21 | ExprStmt |  |
+| variables.rs:528:5:528:21 | ExprStmt | variables.rs:528:5:528:18 | PathExpr |  |
+| variables.rs:529:5:529:18 | PathExpr | variables.rs:529:5:529:20 | CallExpr |  |
+| variables.rs:529:5:529:20 | CallExpr | variables.rs:530:5:530:21 | ExprStmt |  |
+| variables.rs:529:5:529:21 | ExprStmt | variables.rs:529:5:529:18 | PathExpr |  |
+| variables.rs:530:5:530:18 | PathExpr | variables.rs:530:5:530:20 | CallExpr |  |
+| variables.rs:530:5:530:20 | CallExpr | variables.rs:531:5:531:36 | ExprStmt |  |
+| variables.rs:530:5:530:21 | ExprStmt | variables.rs:530:5:530:18 | PathExpr |  |
+| variables.rs:531:5:531:18 | PathExpr | variables.rs:531:20:531:22 | "a" |  |
+| variables.rs:531:5:531:35 | CallExpr | variables.rs:532:5:532:37 | ExprStmt |  |
+| variables.rs:531:5:531:36 | ExprStmt | variables.rs:531:5:531:18 | PathExpr |  |
+| variables.rs:531:20:531:22 | "a" | variables.rs:531:26:531:28 | "b" |  |
+| variables.rs:531:25:531:34 | TupleExpr | variables.rs:531:5:531:35 | CallExpr |  |
+| variables.rs:531:26:531:28 | "b" | variables.rs:531:31:531:33 | "c" |  |
+| variables.rs:531:31:531:33 | "c" | variables.rs:531:25:531:34 | TupleExpr |  |
+| variables.rs:532:5:532:18 | PathExpr | variables.rs:532:20:532:31 | PathExpr |  |
+| variables.rs:532:5:532:36 | CallExpr | variables.rs:533:5:533:26 | ExprStmt |  |
+| variables.rs:532:5:532:37 | ExprStmt | variables.rs:532:5:532:18 | PathExpr |  |
+| variables.rs:532:20:532:31 | PathExpr | variables.rs:532:33:532:34 | 45 |  |
+| variables.rs:532:20:532:35 | CallExpr | variables.rs:532:5:532:36 | CallExpr |  |
+| variables.rs:532:33:532:34 | 45 | variables.rs:532:20:532:35 | CallExpr |  |
+| variables.rs:533:5:533:23 | PathExpr | variables.rs:533:5:533:25 | CallExpr |  |
+| variables.rs:533:5:533:25 | CallExpr | variables.rs:534:5:534:23 | ExprStmt |  |
+| variables.rs:533:5:533:26 | ExprStmt | variables.rs:533:5:533:23 | PathExpr |  |
+| variables.rs:534:5:534:20 | PathExpr | variables.rs:534:5:534:22 | CallExpr |  |
+| variables.rs:534:5:534:22 | CallExpr | variables.rs:535:5:535:19 | ExprStmt |  |
+| variables.rs:534:5:534:23 | ExprStmt | variables.rs:534:5:534:20 | PathExpr |  |
+| variables.rs:535:5:535:16 | PathExpr | variables.rs:535:5:535:18 | CallExpr |  |
+| variables.rs:535:5:535:18 | CallExpr | variables.rs:536:5:536:17 | ExprStmt |  |
+| variables.rs:535:5:535:19 | ExprStmt | variables.rs:535:5:535:16 | PathExpr |  |
+| variables.rs:536:5:536:14 | PathExpr | variables.rs:536:5:536:16 | CallExpr |  |
+| variables.rs:536:5:536:16 | CallExpr | variables.rs:537:5:537:13 | ExprStmt |  |
+| variables.rs:536:5:536:17 | ExprStmt | variables.rs:536:5:536:14 | PathExpr |  |
+| variables.rs:537:5:537:10 | PathExpr | variables.rs:537:5:537:12 | CallExpr |  |
+| variables.rs:537:5:537:12 | CallExpr | variables.rs:538:5:538:17 | ExprStmt |  |
+| variables.rs:537:5:537:13 | ExprStmt | variables.rs:537:5:537:10 | PathExpr |  |
+| variables.rs:538:5:538:14 | PathExpr | variables.rs:538:5:538:16 | CallExpr |  |
+| variables.rs:538:5:538:16 | CallExpr | variables.rs:539:5:539:12 | ExprStmt |  |
+| variables.rs:538:5:538:17 | ExprStmt | variables.rs:538:5:538:14 | PathExpr |  |
+| variables.rs:539:5:539:9 | PathExpr | variables.rs:539:5:539:11 | CallExpr |  |
+| variables.rs:539:5:539:11 | CallExpr | variables.rs:540:5:540:18 | ExprStmt |  |
+| variables.rs:539:5:539:12 | ExprStmt | variables.rs:539:5:539:9 | PathExpr |  |
+| variables.rs:540:5:540:15 | PathExpr | variables.rs:540:5:540:17 | CallExpr |  |
+| variables.rs:540:5:540:17 | CallExpr | variables.rs:541:5:541:20 | ExprStmt |  |
+| variables.rs:540:5:540:18 | ExprStmt | variables.rs:540:5:540:15 | PathExpr |  |
+| variables.rs:541:5:541:17 | PathExpr | variables.rs:541:5:541:19 | CallExpr |  |
+| variables.rs:541:5:541:19 | CallExpr | variables.rs:542:5:542:14 | ExprStmt |  |
+| variables.rs:541:5:541:20 | ExprStmt | variables.rs:541:5:541:17 | PathExpr |  |
+| variables.rs:542:5:542:11 | PathExpr | variables.rs:542:5:542:13 | CallExpr |  |
+| variables.rs:542:5:542:13 | CallExpr | variables.rs:543:5:543:14 | ExprStmt |  |
+| variables.rs:542:5:542:14 | ExprStmt | variables.rs:542:5:542:11 | PathExpr |  |
+| variables.rs:543:5:543:11 | PathExpr | variables.rs:543:5:543:13 | CallExpr |  |
+| variables.rs:543:5:543:13 | CallExpr | variables.rs:544:5:544:30 | ExprStmt |  |
+| variables.rs:543:5:543:14 | ExprStmt | variables.rs:543:5:543:11 | PathExpr |  |
+| variables.rs:544:5:544:27 | PathExpr | variables.rs:544:5:544:29 | CallExpr |  |
+| variables.rs:544:5:544:29 | CallExpr | variables.rs:512:11:545:1 | BlockExpr |  |
+| variables.rs:544:5:544:30 | ExprStmt | variables.rs:544:5:544:27 | PathExpr |  |
 breakTarget
 continueTarget
diff --git a/rust/ql/test/library-tests/variables/Ssa.expected b/rust/ql/test/library-tests/variables/Ssa.expected
index 8b2ac3109ba..3e3ba9af7c9 100644
--- a/rust/ql/test/library-tests/variables/Ssa.expected
+++ b/rust/ql/test/library-tests/variables/Ssa.expected
@@ -1,524 +1,550 @@
 nonSsaVariable
-| variables.rs:330:13:330:13 | a |
-| variables.rs:338:13:338:13 | i |
-| variables.rs:361:13:361:13 | x |
-| variables.rs:368:13:368:13 | z |
-| variables.rs:381:13:381:13 | x |
-| variables.rs:389:13:389:13 | x |
-| variables.rs:450:13:450:13 | a |
-| variables.rs:482:11:482:11 | a |
+| 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:478:13:478:13 | a |
+| variables.rs:506:11:506: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:12:9:12:10 | x1 | variables.rs:12:9:12:10 | x1 |
-| variables.rs:17:9:17:14 | x2 | variables.rs:17:13:17:14 | x2 |
-| variables.rs:19:5:19:6 | x2 | variables.rs:17:13:17:14 | x2 |
-| variables.rs:24:9:24:10 | x3 | variables.rs:24:9:24:10 | x3 |
-| variables.rs:26:9:26:10 | x3 | variables.rs:26:9:26:10 | x3 |
-| variables.rs:32:9:32:10 | x4 | variables.rs:32:9:32:10 | x4 |
-| variables.rs:35:13:35:14 | x4 | variables.rs:35:13:35:14 | x4 |
-| variables.rs:49:13:49:14 | a1 | variables.rs:49:13:49:14 | a1 |
-| variables.rs:50:13:50:14 | b1 | variables.rs:50:13:50:14 | b1 |
-| variables.rs:53:13:53:13 | x | variables.rs:53:13:53:13 | x |
-| variables.rs:54:13:54:13 | y | variables.rs:54:13:54:13 | y |
-| variables.rs:64:9:64:10 | p1 | variables.rs:64:9:64:10 | p1 |
-| variables.rs:66:12:66:13 | a2 | variables.rs:66:12:66:13 | a2 |
-| variables.rs:67:12:67:13 | b2 | variables.rs:67:12:67:13 | b2 |
-| variables.rs:74:9:74:10 | s1 | variables.rs:74:9:74:10 | s1 |
-| variables.rs:76:17:76:22 | s2 | variables.rs:76:21:76:22 | s2 |
-| variables.rs:83:14:83:15 | x5 | variables.rs:83:14:83:15 | x5 |
-| variables.rs:91:9:91:10 | s1 | variables.rs:91:9:91:10 | s1 |
-| variables.rs:93:20:93:25 | s2 | variables.rs:93:24:93:25 | s2 |
-| variables.rs:100:9:100:10 | x6 | variables.rs:100:9:100:10 | x6 |
-| variables.rs:101:9:101:10 | y1 | variables.rs:101:9:101:10 | y1 |
-| variables.rs:105:14:105:15 | y1 | variables.rs:105:14:105:15 | y1 |
-| variables.rs:117:9:117:15 | numbers | variables.rs:117:9:117:15 | numbers |
-| variables.rs:121:13:121:17 | first | variables.rs:121:13:121:17 | first |
-| variables.rs:122:13:122:17 | third | variables.rs:122:13:122:17 | third |
-| variables.rs:123:13:123:17 | fifth | variables.rs:123:13:123:17 | fifth |
-| variables.rs:133:13:133:17 | first | variables.rs:133:13:133:17 | first |
-| variables.rs:135:13:135:16 | last | variables.rs:135:13:135:16 | last |
-| variables.rs:144:9:144:10 | p2 | variables.rs:144:9:144:10 | p2 |
-| variables.rs:148:16:148:17 | x7 | variables.rs:148:16:148:17 | x7 |
-| variables.rs:158:9:158:11 | msg | variables.rs:158:9:158:11 | msg |
-| variables.rs:162:17:162:35 | [match(true)] id_variable | variables.rs:162:17:162:27 | id_variable |
-| variables.rs:167:26:167:27 | id | variables.rs:167:26:167:27 | id |
-| variables.rs:178:9:178:14 | either | variables.rs:178:9:178:14 | either |
-| variables.rs:180:9:180:44 | [match(true)] phi | variables.rs:180:9:180:44 | a3 |
-| variables.rs:180:22:180:23 | a3 | variables.rs:180:9:180:44 | a3 |
-| variables.rs:180:42:180:43 | a3 | variables.rs:180:9:180:44 | a3 |
-| variables.rs:192:9:192:10 | tv | variables.rs:192:9:192:10 | tv |
-| variables.rs:194:9:194:81 | [match(true)] phi | variables.rs:194:9:194:81 | a4 |
-| variables.rs:194:28:194:29 | a4 | variables.rs:194:9:194:81 | a4 |
-| variables.rs:194:54:194:55 | a4 | variables.rs:194:9:194:81 | a4 |
-| variables.rs:194:79:194:80 | a4 | variables.rs:194:9:194:81 | a4 |
-| variables.rs:198:9:198:83 | [match(true)] phi | variables.rs:198:9:198:83 | a5 |
-| variables.rs:198:10:198:57 | [match(true)] phi | variables.rs:198:9:198:83 | a5 |
-| variables.rs:198:29:198:30 | a5 | variables.rs:198:9:198:83 | a5 |
-| variables.rs:198:55:198:56 | a5 | variables.rs:198:9:198:83 | a5 |
-| variables.rs:198:81:198:82 | a5 | variables.rs:198:9:198:83 | a5 |
-| variables.rs:202:9:202:83 | [match(true)] phi | variables.rs:202:9:202:83 | a6 |
-| variables.rs:202:28:202:29 | a6 | variables.rs:202:9:202:83 | a6 |
-| variables.rs:202:35:202:82 | [match(true)] phi | variables.rs:202:9:202:83 | a6 |
-| variables.rs:202:55:202:56 | a6 | variables.rs:202:9:202:83 | a6 |
-| variables.rs:202:80:202:81 | a6 | variables.rs:202:9:202:83 | a6 |
-| variables.rs:208:9:208:14 | either | variables.rs:208:9:208:14 | either |
-| variables.rs:210:9:210:44 | [match(true)] phi | variables.rs:210:9:210:44 | a7 |
-| variables.rs:210:22:210:23 | a7 | variables.rs:210:9:210:44 | a7 |
-| variables.rs:210:42:210:43 | a7 | variables.rs:210:9:210:44 | a7 |
-| variables.rs:218:9:218:14 | either | variables.rs:218:9:218:14 | either |
-| variables.rs:221:9:222:52 | [match(true)] e | variables.rs:221:13:221:13 | e |
-| variables.rs:222:14:222:51 | [match(true)] phi | variables.rs:222:14:222:51 | a11 |
-| variables.rs:222:27:222:29 | a11 | variables.rs:222:14:222:51 | a11 |
-| variables.rs:222:48:222:50 | a11 | variables.rs:222:14:222:51 | a11 |
-| variables.rs:225:33:225:35 | a12 | variables.rs:225:33:225:35 | a12 |
-| variables.rs:242:9:242:10 | fv | variables.rs:242:9:242:10 | fv |
-| variables.rs:244:9:244:109 | [match(true)] phi | variables.rs:244:9:244:109 | a13 |
-| variables.rs:244:27:244:29 | a13 | variables.rs:244:9:244:109 | a13 |
-| variables.rs:244:35:244:82 | [match(true)] phi | variables.rs:244:9:244:109 | a13 |
-| variables.rs:244:54:244:56 | a13 | variables.rs:244:9:244:109 | a13 |
-| variables.rs:244:79:244:81 | a13 | variables.rs:244:9:244:109 | a13 |
-| variables.rs:244:106:244:108 | a13 | variables.rs:244:9:244:109 | a13 |
-| variables.rs:250:5:250:6 | a8 | variables.rs:250:5:250:6 | a8 |
-| variables.rs:252:9:252:10 | b3 | variables.rs:252:9:252:10 | b3 |
-| variables.rs:253:9:253:10 | c1 | variables.rs:253:9:253:10 | c1 |
-| variables.rs:261:6:261:41 | [match(true)] phi | variables.rs:261:6:261:41 | a9 |
-| variables.rs:261:19:261:20 | a9 | variables.rs:261:6:261:41 | a9 |
-| variables.rs:261:39:261:40 | a9 | variables.rs:261:6:261:41 | a9 |
-| variables.rs:268:9:268:15 | a10 | variables.rs:268:13:268:15 | a10 |
-| variables.rs:269:9:269:14 | b4 | variables.rs:269:13:269:14 | b4 |
-| variables.rs:270:9:270:14 | c2 | variables.rs:270:13:270:14 | c2 |
-| variables.rs:277:9:277:10 | c2 | variables.rs:270:13:270:14 | c2 |
-| variables.rs:278:9:278:10 | b4 | variables.rs:269:13:269:14 | b4 |
-| variables.rs:279:9:279:11 | a10 | variables.rs:268:13:268:15 | a10 |
-| variables.rs:291:13:291:15 | a10 | variables.rs:291:13:291:15 | a10 |
-| variables.rs:292:13:292:14 | b4 | variables.rs:292:13:292:14 | b4 |
-| variables.rs:304:9:304:23 | example_closure | variables.rs:304:9:304:23 | example_closure |
-| variables.rs:305:10:305:10 | x | variables.rs:305:10:305:10 | x |
-| variables.rs:307:9:307:10 | n1 | variables.rs:307:9:307:10 | n1 |
-| variables.rs:312:9:312:26 | immutable_variable | variables.rs:312:9:312:26 | immutable_variable |
-| variables.rs:313:10:313:10 | x | variables.rs:313:10:313:10 | x |
-| variables.rs:315:9:315:10 | n2 | variables.rs:315:9:315:10 | n2 |
-| variables.rs:321:9:321:9 | v | variables.rs:321:9:321:9 | v |
-| variables.rs:323:9:323:12 | text | variables.rs:323:9:323:12 | text |
-| variables.rs:339:9:339:13 | ref_i | variables.rs:339:9:339:13 | ref_i |
-| variables.rs:345:17:345:17 | x | variables.rs:345:17:345:17 | x |
-| variables.rs:352:22:352:22 | x | variables.rs:352:22:352:22 | x |
-| variables.rs:352:39:352:39 | y | variables.rs:352:39:352:39 | y |
-| variables.rs:362:9:362:9 | y | variables.rs:362:9:362:9 | y |
-| variables.rs:369:9:369:9 | w | variables.rs:369:9:369:9 | w |
-| variables.rs:382:9:382:9 | y | variables.rs:382:9:382:9 | y |
-| variables.rs:390:9:390:15 | cap | variables.rs:390:13:390:15 | cap |
-| variables.rs:399:9:399:9 | x | variables.rs:399:9:399:9 | x |
-| variables.rs:400:9:400:15 | cap | variables.rs:400:13:400:15 | cap |
-| variables.rs:400:19:402:5 | <captured entry> x | variables.rs:399:9:399:9 | x |
-| variables.rs:407:8:407:8 | b | variables.rs:407:8:407:8 | b |
-| variables.rs:408:9:408:13 | x | variables.rs:408:13:408:13 | x |
-| variables.rs:411:5:419:5 | phi | variables.rs:408:13:408:13 | x |
-| variables.rs:412:9:412:9 | x | variables.rs:408:13:408:13 | x |
-| variables.rs:416:9:416:9 | x | variables.rs:408:13:408:13 | x |
-| variables.rs:423:13:423:14 | b1 | variables.rs:423:13:423:14 | b1 |
-| variables.rs:423:24:423:25 | b2 | variables.rs:423:24:423:25 | b2 |
-| variables.rs:424:9:424:9 | x | variables.rs:424:9:424:9 | x |
-| variables.rs:458:14:458:14 | x | variables.rs:458:14:458:14 | x |
-| variables.rs:463:9:463:9 | x | variables.rs:463:9:463:9 | x |
-| variables.rs:467:9:467:9 | z | variables.rs:467:9:467:9 | z |
+| 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:435:8:435:8 | b | variables.rs:435:8:435:8 | b |
+| variables.rs:436:9:436:13 | x | variables.rs:436:13:436:13 | x |
+| variables.rs:439:5:447:5 | phi | variables.rs:436:13:436:13 | x |
+| variables.rs:440:9:440:9 | x | variables.rs:436:13:436:13 | x |
+| variables.rs:444:9:444:9 | x | variables.rs:436:13:436:13 | x |
+| variables.rs:451:13:451:14 | b1 | variables.rs:451:13:451:14 | b1 |
+| variables.rs:451:24:451:25 | b2 | variables.rs:451:24:451:25 | b2 |
+| variables.rs:452:9:452:9 | x | variables.rs:452:9:452:9 | x |
+| variables.rs:487:9:487:9 | x | variables.rs:487:9:487:9 | x |
+| variables.rs:491:9:491:9 | z | variables.rs:491:9:491: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:12:9:12:10 | x1 | variables.rs:12:9:12:10 | x1 | variables.rs:13:15:13:16 | x1 |
-| variables.rs:17:9:17:14 | x2 | variables.rs:17:13:17:14 | x2 | variables.rs:18:15:18:16 | x2 |
-| variables.rs:19:5:19:6 | x2 | variables.rs:17:13:17:14 | x2 | variables.rs:20:15:20:16 | x2 |
-| variables.rs:24:9:24:10 | x3 | variables.rs:24:9:24:10 | x3 | variables.rs:25:15:25:16 | x3 |
-| variables.rs:24:9:24:10 | x3 | variables.rs:24:9:24:10 | x3 | variables.rs:27:9:27:10 | x3 |
-| variables.rs:26:9:26:10 | x3 | variables.rs:26:9:26:10 | x3 | variables.rs:28:15:28:16 | x3 |
-| variables.rs:32:9:32:10 | x4 | variables.rs:32:9:32:10 | x4 | variables.rs:33:15:33:16 | x4 |
-| variables.rs:32:9:32:10 | x4 | variables.rs:32:9:32:10 | x4 | variables.rs:38:15:38:16 | x4 |
-| variables.rs:35:13:35:14 | x4 | variables.rs:35:13:35:14 | x4 | variables.rs:36:19:36:20 | x4 |
-| variables.rs:49:13:49:14 | a1 | variables.rs:49:13:49:14 | a1 | variables.rs:57:15:57:16 | a1 |
-| variables.rs:50:13:50:14 | b1 | variables.rs:50:13:50:14 | b1 | variables.rs:58:15:58:16 | b1 |
-| variables.rs:53:13:53:13 | x | variables.rs:53:13:53:13 | x | variables.rs:59:15:59:15 | x |
-| variables.rs:54:13:54:13 | y | variables.rs:54:13:54:13 | y | variables.rs:60:15:60:15 | y |
-| variables.rs:64:9:64:10 | p1 | variables.rs:64:9:64:10 | p1 | variables.rs:68:9:68:10 | p1 |
-| variables.rs:66:12:66:13 | a2 | variables.rs:66:12:66:13 | a2 | variables.rs:69:15:69:16 | a2 |
-| variables.rs:67:12:67:13 | b2 | variables.rs:67:12:67:13 | b2 | variables.rs:70:15:70:16 | b2 |
-| variables.rs:74:9:74:10 | s1 | variables.rs:74:9:74:10 | s1 | variables.rs:77:11:77:12 | s1 |
-| variables.rs:76:17:76:22 | s2 | variables.rs:76:21:76:22 | s2 | variables.rs:78:19:78:20 | s2 |
-| variables.rs:83:14:83:15 | x5 | variables.rs:83:14:83:15 | x5 | variables.rs:87:15:87:16 | x5 |
-| variables.rs:91:9:91:10 | s1 | variables.rs:91:9:91:10 | s1 | variables.rs:94:11:94:12 | s1 |
-| variables.rs:93:20:93:25 | s2 | variables.rs:93:24:93:25 | s2 | variables.rs:95:19:95:20 | s2 |
-| variables.rs:100:9:100:10 | x6 | variables.rs:100:9:100:10 | x6 | variables.rs:103:11:103:12 | x6 |
-| variables.rs:101:9:101:10 | y1 | variables.rs:101:9:101:10 | y1 | variables.rs:113:15:113:16 | y1 |
-| variables.rs:105:14:105:15 | y1 | variables.rs:105:14:105:15 | y1 | variables.rs:108:23:108:24 | y1 |
-| variables.rs:117:9:117:15 | numbers | variables.rs:117:9:117:15 | numbers | variables.rs:119:11:119:17 | numbers |
-| variables.rs:117:9:117:15 | numbers | variables.rs:117:9:117:15 | numbers | variables.rs:131:11:131:17 | numbers |
-| variables.rs:121:13:121:17 | first | variables.rs:121:13:121:17 | first | variables.rs:125:23:125:27 | first |
-| variables.rs:122:13:122:17 | third | variables.rs:122:13:122:17 | third | variables.rs:126:23:126:27 | third |
-| variables.rs:123:13:123:17 | fifth | variables.rs:123:13:123:17 | fifth | variables.rs:127:23:127:27 | fifth |
-| variables.rs:133:13:133:17 | first | variables.rs:133:13:133:17 | first | variables.rs:137:23:137:27 | first |
-| variables.rs:135:13:135:16 | last | variables.rs:135:13:135:16 | last | variables.rs:138:23:138:26 | last |
-| variables.rs:144:9:144:10 | p2 | variables.rs:144:9:144:10 | p2 | variables.rs:146:11:146:12 | p2 |
-| variables.rs:148:16:148:17 | x7 | variables.rs:148:16:148:17 | x7 | variables.rs:149:24:149:25 | x7 |
-| variables.rs:158:9:158:11 | msg | variables.rs:158:9:158:11 | msg | variables.rs:160:11:160:13 | msg |
-| variables.rs:162:17:162:35 | [match(true)] id_variable | variables.rs:162:17:162:27 | id_variable | variables.rs:163:24:163:34 | id_variable |
-| variables.rs:167:26:167:27 | id | variables.rs:167:26:167:27 | id | variables.rs:168:23:168:24 | id |
-| variables.rs:178:9:178:14 | either | variables.rs:178:9:178:14 | either | variables.rs:179:11:179:16 | either |
-| variables.rs:180:9:180:44 | [match(true)] phi | variables.rs:180:9:180:44 | a3 | variables.rs:181:26:181:27 | a3 |
-| variables.rs:192:9:192:10 | tv | variables.rs:192:9:192:10 | tv | variables.rs:193:11:193:12 | tv |
-| variables.rs:192:9:192:10 | tv | variables.rs:192:9:192:10 | tv | variables.rs:197:11:197:12 | tv |
-| variables.rs:192:9:192:10 | tv | variables.rs:192:9:192:10 | tv | variables.rs:201:11:201:12 | tv |
-| variables.rs:194:9:194:81 | [match(true)] phi | variables.rs:194:9:194:81 | a4 | variables.rs:195:26:195:27 | a4 |
-| variables.rs:198:9:198:83 | [match(true)] phi | variables.rs:198:9:198:83 | a5 | variables.rs:199:26:199:27 | a5 |
-| variables.rs:202:9:202:83 | [match(true)] phi | variables.rs:202:9:202:83 | a6 | variables.rs:203:26:203:27 | a6 |
-| variables.rs:208:9:208:14 | either | variables.rs:208:9:208:14 | either | variables.rs:209:11:209:16 | either |
-| variables.rs:210:9:210:44 | [match(true)] phi | variables.rs:210:9:210:44 | a7 | variables.rs:211:16:211:17 | a7 |
-| variables.rs:210:9:210:44 | [match(true)] phi | variables.rs:210:9:210:44 | a7 | variables.rs:212:26:212:27 | a7 |
-| variables.rs:218:9:218:14 | either | variables.rs:218:9:218:14 | either | variables.rs:220:11:220:16 | either |
-| variables.rs:221:9:222:52 | [match(true)] e | variables.rs:221:13:221:13 | e | variables.rs:226:15:226:15 | e |
-| variables.rs:222:14:222:51 | [match(true)] phi | variables.rs:222:14:222:51 | a11 | variables.rs:224:23:224:25 | a11 |
-| variables.rs:225:33:225:35 | a12 | variables.rs:225:33:225:35 | a12 | variables.rs:227:28:227:30 | a12 |
-| variables.rs:242:9:242:10 | fv | variables.rs:242:9:242:10 | fv | variables.rs:243:11:243:12 | fv |
-| variables.rs:244:9:244:109 | [match(true)] phi | variables.rs:244:9:244:109 | a13 | variables.rs:245:26:245:28 | a13 |
-| variables.rs:250:5:250:6 | a8 | variables.rs:250:5:250:6 | a8 | variables.rs:255:15:255:16 | a8 |
-| variables.rs:252:9:252:10 | b3 | variables.rs:252:9:252:10 | b3 | variables.rs:256:15:256:16 | b3 |
-| variables.rs:253:9:253:10 | c1 | variables.rs:253:9:253:10 | c1 | variables.rs:257:15:257:16 | c1 |
-| variables.rs:261:6:261:41 | [match(true)] phi | variables.rs:261:6:261:41 | a9 | variables.rs:263:15:263:16 | a9 |
-| variables.rs:268:9:268:15 | a10 | variables.rs:268:13:268:15 | a10 | variables.rs:272:15:272:17 | a10 |
-| variables.rs:269:9:269:14 | b4 | variables.rs:269:13:269:14 | b4 | variables.rs:273:15:273:16 | b4 |
-| variables.rs:270:9:270:14 | c2 | variables.rs:270:13:270:14 | c2 | variables.rs:274:15:274:16 | c2 |
-| variables.rs:277:9:277:10 | c2 | variables.rs:270:13:270:14 | c2 | variables.rs:283:9:283:10 | c2 |
-| variables.rs:277:9:277:10 | c2 | variables.rs:270:13:270:14 | c2 | variables.rs:287:15:287:16 | c2 |
-| variables.rs:278:9:278:10 | b4 | variables.rs:269:13:269:14 | b4 | variables.rs:282:9:282:10 | b4 |
-| variables.rs:278:9:278:10 | b4 | variables.rs:269:13:269:14 | b4 | variables.rs:286:15:286:16 | b4 |
-| variables.rs:278:9:278:10 | b4 | variables.rs:269:13:269:14 | b4 | variables.rs:300:15:300:16 | b4 |
-| variables.rs:279:9:279:11 | a10 | variables.rs:268:13:268:15 | a10 | variables.rs:281:9:281:11 | a10 |
-| variables.rs:279:9:279:11 | a10 | variables.rs:268:13:268:15 | a10 | variables.rs:285:15:285:17 | a10 |
-| variables.rs:279:9:279:11 | a10 | variables.rs:268:13:268:15 | a10 | variables.rs:299:15:299:17 | a10 |
-| variables.rs:291:13:291:15 | a10 | variables.rs:291:13:291:15 | a10 | variables.rs:294:23:294:25 | a10 |
-| variables.rs:292:13:292:14 | b4 | variables.rs:292:13:292:14 | b4 | variables.rs:295:23:295:24 | b4 |
-| variables.rs:304:9:304:23 | example_closure | variables.rs:304:9:304:23 | example_closure | variables.rs:308:9:308:23 | example_closure |
-| variables.rs:305:10:305:10 | x | variables.rs:305:10:305:10 | x | variables.rs:306:9:306:9 | x |
-| variables.rs:307:9:307:10 | n1 | variables.rs:307:9:307:10 | n1 | variables.rs:309:15:309:16 | n1 |
-| variables.rs:312:9:312:26 | immutable_variable | variables.rs:312:9:312:26 | immutable_variable | variables.rs:316:9:316:26 | immutable_variable |
-| variables.rs:313:10:313:10 | x | variables.rs:313:10:313:10 | x | variables.rs:314:9:314:9 | x |
-| variables.rs:315:9:315:10 | n2 | variables.rs:315:9:315:10 | n2 | variables.rs:317:15:317:16 | n2 |
-| variables.rs:321:9:321:9 | v | variables.rs:321:9:321:9 | v | variables.rs:324:12:324:12 | v |
-| variables.rs:323:9:323:12 | text | variables.rs:323:9:323:12 | text | variables.rs:325:19:325:22 | text |
-| variables.rs:339:9:339:13 | ref_i | variables.rs:339:9:339:13 | ref_i | variables.rs:341:6:341:10 | ref_i |
-| variables.rs:345:17:345:17 | x | variables.rs:345:17:345:17 | x | variables.rs:346:6:346:6 | x |
-| variables.rs:345:17:345:17 | x | variables.rs:345:17:345:17 | x | variables.rs:347:10:347:10 | x |
-| variables.rs:345:17:345:17 | x | variables.rs:345:17:345:17 | x | variables.rs:348:10:348:10 | x |
-| variables.rs:345:17:345:17 | x | variables.rs:345:17:345:17 | x | variables.rs:349:12:349:12 | x |
-| variables.rs:352:22:352:22 | x | variables.rs:352:22:352:22 | x | variables.rs:353:6:353:6 | x |
-| variables.rs:352:22:352:22 | x | variables.rs:352:22:352:22 | x | variables.rs:354:10:354:10 | x |
-| variables.rs:352:22:352:22 | x | variables.rs:352:22:352:22 | x | variables.rs:355:10:355:10 | x |
-| variables.rs:352:22:352:22 | x | variables.rs:352:22:352:22 | x | variables.rs:357:9:357:9 | x |
-| variables.rs:352:39:352:39 | y | variables.rs:352:39:352:39 | y | variables.rs:356:6:356:6 | y |
-| variables.rs:362:9:362:9 | y | variables.rs:362:9:362:9 | y | variables.rs:364:6:364:6 | y |
-| variables.rs:369:9:369:9 | w | variables.rs:369:9:369:9 | w | variables.rs:373:9:373:9 | w |
-| variables.rs:369:9:369:9 | w | variables.rs:369:9:369:9 | w | variables.rs:375:7:375:7 | w |
-| variables.rs:382:9:382:9 | y | variables.rs:382:9:382:9 | y | variables.rs:384:6:384:6 | y |
-| variables.rs:390:9:390:15 | cap | variables.rs:390:13:390:15 | cap | variables.rs:394:5:394:7 | cap |
-| variables.rs:399:9:399:9 | x | variables.rs:399:9:399:9 | x | variables.rs:404:15:404:15 | x |
-| variables.rs:400:9:400:15 | cap | variables.rs:400:13:400:15 | cap | variables.rs:403:5:403:7 | cap |
-| variables.rs:400:19:402:5 | <captured entry> x | variables.rs:399:9:399:9 | x | variables.rs:401:19:401:19 | x |
-| variables.rs:407:8:407:8 | b | variables.rs:407:8:407:8 | b | variables.rs:411:8:411:8 | b |
-| variables.rs:408:9:408:13 | x | variables.rs:408:13:408:13 | x | variables.rs:409:15:409:15 | x |
-| variables.rs:408:9:408:13 | x | variables.rs:408:13:408:13 | x | variables.rs:410:15:410:15 | x |
-| variables.rs:411:5:419:5 | phi | variables.rs:408:13:408:13 | x | variables.rs:420:15:420:15 | x |
-| variables.rs:412:9:412:9 | x | variables.rs:408:13:408:13 | x | variables.rs:413:19:413:19 | x |
-| variables.rs:412:9:412:9 | x | variables.rs:408:13:408:13 | x | variables.rs:414:19:414:19 | x |
-| variables.rs:416:9:416:9 | x | variables.rs:408:13:408:13 | x | variables.rs:417:19:417:19 | x |
-| variables.rs:416:9:416:9 | x | variables.rs:408:13:408:13 | x | variables.rs:418:19:418:19 | x |
-| variables.rs:423:13:423:14 | b1 | variables.rs:423:13:423:14 | b1 | variables.rs:425:8:425:9 | b1 |
-| variables.rs:423:24:423:25 | b2 | variables.rs:423:24:423:25 | b2 | variables.rs:431:8:431:9 | b2 |
-| variables.rs:424:9:424:9 | x | variables.rs:424:9:424:9 | x | variables.rs:426:19:426:19 | x |
-| variables.rs:424:9:424:9 | x | variables.rs:424:9:424:9 | x | variables.rs:428:19:428:19 | x |
-| variables.rs:424:9:424:9 | x | variables.rs:424:9:424:9 | x | variables.rs:432:19:432:19 | x |
-| variables.rs:424:9:424:9 | x | variables.rs:424:9:424:9 | x | variables.rs:434:19:434:19 | x |
-| variables.rs:458:14:458:14 | x | variables.rs:458:14:458:14 | x | variables.rs:459:16:459:16 | x |
-| variables.rs:463:9:463:9 | x | variables.rs:463:9:463:9 | x | variables.rs:465:15:465:15 | x |
+| 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:435:8:435:8 | b | variables.rs:435:8:435:8 | b | variables.rs:439:8:439:8 | b |
+| variables.rs:436:9:436:13 | x | variables.rs:436:13:436:13 | x | variables.rs:437:15:437:15 | x |
+| variables.rs:436:9:436:13 | x | variables.rs:436:13:436:13 | x | variables.rs:438:15:438:15 | x |
+| variables.rs:439:5:447:5 | phi | variables.rs:436:13:436:13 | x | variables.rs:448:15:448:15 | x |
+| variables.rs:440:9:440:9 | x | variables.rs:436:13:436:13 | x | variables.rs:441:19:441:19 | x |
+| variables.rs:440:9:440:9 | x | variables.rs:436:13:436:13 | x | variables.rs:442:19:442:19 | x |
+| variables.rs:444:9:444:9 | x | variables.rs:436:13:436:13 | x | variables.rs:445:19:445:19 | x |
+| variables.rs:444:9:444:9 | x | variables.rs:436:13:436:13 | x | variables.rs:446:19:446:19 | x |
+| variables.rs:451:13:451:14 | b1 | variables.rs:451:13:451:14 | b1 | variables.rs:453:8:453:9 | b1 |
+| variables.rs:451:24:451:25 | b2 | variables.rs:451:24:451:25 | b2 | variables.rs:459:8:459:9 | b2 |
+| variables.rs:452:9:452:9 | x | variables.rs:452:9:452:9 | x | variables.rs:454:19:454:19 | x |
+| variables.rs:452:9:452:9 | x | variables.rs:452:9:452:9 | x | variables.rs:456:19:456:19 | x |
+| variables.rs:452:9:452:9 | x | variables.rs:452:9:452:9 | x | variables.rs:460:19:460:19 | x |
+| variables.rs:452:9:452:9 | x | variables.rs:452:9:452:9 | x | variables.rs:462:19:462:19 | x |
+| variables.rs:487:9:487:9 | x | variables.rs:487:9:487:9 | x | variables.rs:489:15:489: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:12:9:12:10 | x1 | variables.rs:12:9:12:10 | x1 | variables.rs:13:15:13:16 | x1 |
-| variables.rs:17:9:17:14 | x2 | variables.rs:17:13:17:14 | x2 | variables.rs:18:15:18:16 | x2 |
-| variables.rs:19:5:19:6 | x2 | variables.rs:17:13:17:14 | x2 | variables.rs:20:15:20:16 | x2 |
-| variables.rs:24:9:24:10 | x3 | variables.rs:24:9:24:10 | x3 | variables.rs:25:15:25:16 | x3 |
-| variables.rs:26:9:26:10 | x3 | variables.rs:26:9:26:10 | x3 | variables.rs:28:15:28:16 | x3 |
-| variables.rs:32:9:32:10 | x4 | variables.rs:32:9:32:10 | x4 | variables.rs:33:15:33:16 | x4 |
-| variables.rs:35:13:35:14 | x4 | variables.rs:35:13:35:14 | x4 | variables.rs:36:19:36:20 | x4 |
-| variables.rs:49:13:49:14 | a1 | variables.rs:49:13:49:14 | a1 | variables.rs:57:15:57:16 | a1 |
-| variables.rs:50:13:50:14 | b1 | variables.rs:50:13:50:14 | b1 | variables.rs:58:15:58:16 | b1 |
-| variables.rs:53:13:53:13 | x | variables.rs:53:13:53:13 | x | variables.rs:59:15:59:15 | x |
-| variables.rs:54:13:54:13 | y | variables.rs:54:13:54:13 | y | variables.rs:60:15:60:15 | y |
-| variables.rs:64:9:64:10 | p1 | variables.rs:64:9:64:10 | p1 | variables.rs:68:9:68:10 | p1 |
-| variables.rs:66:12:66:13 | a2 | variables.rs:66:12:66:13 | a2 | variables.rs:69:15:69:16 | a2 |
-| variables.rs:67:12:67:13 | b2 | variables.rs:67:12:67:13 | b2 | variables.rs:70:15:70:16 | b2 |
-| variables.rs:74:9:74:10 | s1 | variables.rs:74:9:74:10 | s1 | variables.rs:77:11:77:12 | s1 |
-| variables.rs:76:17:76:22 | s2 | variables.rs:76:21:76:22 | s2 | variables.rs:78:19:78:20 | s2 |
-| variables.rs:83:14:83:15 | x5 | variables.rs:83:14:83:15 | x5 | variables.rs:87:15:87:16 | x5 |
-| variables.rs:91:9:91:10 | s1 | variables.rs:91:9:91:10 | s1 | variables.rs:94:11:94:12 | s1 |
-| variables.rs:93:20:93:25 | s2 | variables.rs:93:24:93:25 | s2 | variables.rs:95:19:95:20 | s2 |
-| variables.rs:100:9:100:10 | x6 | variables.rs:100:9:100:10 | x6 | variables.rs:103:11:103:12 | x6 |
-| variables.rs:101:9:101:10 | y1 | variables.rs:101:9:101:10 | y1 | variables.rs:113:15:113:16 | y1 |
-| variables.rs:105:14:105:15 | y1 | variables.rs:105:14:105:15 | y1 | variables.rs:108:23:108:24 | y1 |
-| variables.rs:117:9:117:15 | numbers | variables.rs:117:9:117:15 | numbers | variables.rs:119:11:119:17 | numbers |
-| variables.rs:121:13:121:17 | first | variables.rs:121:13:121:17 | first | variables.rs:125:23:125:27 | first |
-| variables.rs:122:13:122:17 | third | variables.rs:122:13:122:17 | third | variables.rs:126:23:126:27 | third |
-| variables.rs:123:13:123:17 | fifth | variables.rs:123:13:123:17 | fifth | variables.rs:127:23:127:27 | fifth |
-| variables.rs:133:13:133:17 | first | variables.rs:133:13:133:17 | first | variables.rs:137:23:137:27 | first |
-| variables.rs:135:13:135:16 | last | variables.rs:135:13:135:16 | last | variables.rs:138:23:138:26 | last |
-| variables.rs:144:9:144:10 | p2 | variables.rs:144:9:144:10 | p2 | variables.rs:146:11:146:12 | p2 |
-| variables.rs:148:16:148:17 | x7 | variables.rs:148:16:148:17 | x7 | variables.rs:149:24:149:25 | x7 |
-| variables.rs:158:9:158:11 | msg | variables.rs:158:9:158:11 | msg | variables.rs:160:11:160:13 | msg |
-| variables.rs:162:17:162:35 | [match(true)] id_variable | variables.rs:162:17:162:27 | id_variable | variables.rs:163:24:163:34 | id_variable |
-| variables.rs:167:26:167:27 | id | variables.rs:167:26:167:27 | id | variables.rs:168:23:168:24 | id |
-| variables.rs:178:9:178:14 | either | variables.rs:178:9:178:14 | either | variables.rs:179:11:179:16 | either |
-| variables.rs:180:9:180:44 | [match(true)] phi | variables.rs:180:9:180:44 | a3 | variables.rs:181:26:181:27 | a3 |
-| variables.rs:192:9:192:10 | tv | variables.rs:192:9:192:10 | tv | variables.rs:193:11:193:12 | tv |
-| variables.rs:194:9:194:81 | [match(true)] phi | variables.rs:194:9:194:81 | a4 | variables.rs:195:26:195:27 | a4 |
-| variables.rs:198:9:198:83 | [match(true)] phi | variables.rs:198:9:198:83 | a5 | variables.rs:199:26:199:27 | a5 |
-| variables.rs:202:9:202:83 | [match(true)] phi | variables.rs:202:9:202:83 | a6 | variables.rs:203:26:203:27 | a6 |
-| variables.rs:208:9:208:14 | either | variables.rs:208:9:208:14 | either | variables.rs:209:11:209:16 | either |
-| variables.rs:210:9:210:44 | [match(true)] phi | variables.rs:210:9:210:44 | a7 | variables.rs:211:16:211:17 | a7 |
-| variables.rs:218:9:218:14 | either | variables.rs:218:9:218:14 | either | variables.rs:220:11:220:16 | either |
-| variables.rs:221:9:222:52 | [match(true)] e | variables.rs:221:13:221:13 | e | variables.rs:226:15:226:15 | e |
-| variables.rs:222:14:222:51 | [match(true)] phi | variables.rs:222:14:222:51 | a11 | variables.rs:224:23:224:25 | a11 |
-| variables.rs:225:33:225:35 | a12 | variables.rs:225:33:225:35 | a12 | variables.rs:227:28:227:30 | a12 |
-| variables.rs:242:9:242:10 | fv | variables.rs:242:9:242:10 | fv | variables.rs:243:11:243:12 | fv |
-| variables.rs:244:9:244:109 | [match(true)] phi | variables.rs:244:9:244:109 | a13 | variables.rs:245:26:245:28 | a13 |
-| variables.rs:250:5:250:6 | a8 | variables.rs:250:5:250:6 | a8 | variables.rs:255:15:255:16 | a8 |
-| variables.rs:252:9:252:10 | b3 | variables.rs:252:9:252:10 | b3 | variables.rs:256:15:256:16 | b3 |
-| variables.rs:253:9:253:10 | c1 | variables.rs:253:9:253:10 | c1 | variables.rs:257:15:257:16 | c1 |
-| variables.rs:261:6:261:41 | [match(true)] phi | variables.rs:261:6:261:41 | a9 | variables.rs:263:15:263:16 | a9 |
-| variables.rs:268:9:268:15 | a10 | variables.rs:268:13:268:15 | a10 | variables.rs:272:15:272:17 | a10 |
-| variables.rs:269:9:269:14 | b4 | variables.rs:269:13:269:14 | b4 | variables.rs:273:15:273:16 | b4 |
-| variables.rs:270:9:270:14 | c2 | variables.rs:270:13:270:14 | c2 | variables.rs:274:15:274:16 | c2 |
-| variables.rs:277:9:277:10 | c2 | variables.rs:270:13:270:14 | c2 | variables.rs:283:9:283:10 | c2 |
-| variables.rs:278:9:278:10 | b4 | variables.rs:269:13:269:14 | b4 | variables.rs:282:9:282:10 | b4 |
-| variables.rs:279:9:279:11 | a10 | variables.rs:268:13:268:15 | a10 | variables.rs:281:9:281:11 | a10 |
-| variables.rs:291:13:291:15 | a10 | variables.rs:291:13:291:15 | a10 | variables.rs:294:23:294:25 | a10 |
-| variables.rs:292:13:292:14 | b4 | variables.rs:292:13:292:14 | b4 | variables.rs:295:23:295:24 | b4 |
-| variables.rs:304:9:304:23 | example_closure | variables.rs:304:9:304:23 | example_closure | variables.rs:308:9:308:23 | example_closure |
-| variables.rs:305:10:305:10 | x | variables.rs:305:10:305:10 | x | variables.rs:306:9:306:9 | x |
-| variables.rs:307:9:307:10 | n1 | variables.rs:307:9:307:10 | n1 | variables.rs:309:15:309:16 | n1 |
-| variables.rs:312:9:312:26 | immutable_variable | variables.rs:312:9:312:26 | immutable_variable | variables.rs:316:9:316:26 | immutable_variable |
-| variables.rs:313:10:313:10 | x | variables.rs:313:10:313:10 | x | variables.rs:314:9:314:9 | x |
-| variables.rs:315:9:315:10 | n2 | variables.rs:315:9:315:10 | n2 | variables.rs:317:15:317:16 | n2 |
-| variables.rs:321:9:321:9 | v | variables.rs:321:9:321:9 | v | variables.rs:324:12:324:12 | v |
-| variables.rs:323:9:323:12 | text | variables.rs:323:9:323:12 | text | variables.rs:325:19:325:22 | text |
-| variables.rs:339:9:339:13 | ref_i | variables.rs:339:9:339:13 | ref_i | variables.rs:341:6:341:10 | ref_i |
-| variables.rs:345:17:345:17 | x | variables.rs:345:17:345:17 | x | variables.rs:346:6:346:6 | x |
-| variables.rs:352:22:352:22 | x | variables.rs:352:22:352:22 | x | variables.rs:353:6:353:6 | x |
-| variables.rs:352:39:352:39 | y | variables.rs:352:39:352:39 | y | variables.rs:356:6:356:6 | y |
-| variables.rs:362:9:362:9 | y | variables.rs:362:9:362:9 | y | variables.rs:364:6:364:6 | y |
-| variables.rs:369:9:369:9 | w | variables.rs:369:9:369:9 | w | variables.rs:373:9:373:9 | w |
-| variables.rs:382:9:382:9 | y | variables.rs:382:9:382:9 | y | variables.rs:384:6:384:6 | y |
-| variables.rs:390:9:390:15 | cap | variables.rs:390:13:390:15 | cap | variables.rs:394:5:394:7 | cap |
-| variables.rs:399:9:399:9 | x | variables.rs:399:9:399:9 | x | variables.rs:404:15:404:15 | x |
-| variables.rs:400:9:400:15 | cap | variables.rs:400:13:400:15 | cap | variables.rs:403:5:403:7 | cap |
-| variables.rs:400:19:402:5 | <captured entry> x | variables.rs:399:9:399:9 | x | variables.rs:401:19:401:19 | x |
-| variables.rs:407:8:407:8 | b | variables.rs:407:8:407:8 | b | variables.rs:411:8:411:8 | b |
-| variables.rs:408:9:408:13 | x | variables.rs:408:13:408:13 | x | variables.rs:409:15:409:15 | x |
-| variables.rs:411:5:419:5 | phi | variables.rs:408:13:408:13 | x | variables.rs:420:15:420:15 | x |
-| variables.rs:412:9:412:9 | x | variables.rs:408:13:408:13 | x | variables.rs:413:19:413:19 | x |
-| variables.rs:416:9:416:9 | x | variables.rs:408:13:408:13 | x | variables.rs:417:19:417:19 | x |
-| variables.rs:423:13:423:14 | b1 | variables.rs:423:13:423:14 | b1 | variables.rs:425:8:425:9 | b1 |
-| variables.rs:423:24:423:25 | b2 | variables.rs:423:24:423:25 | b2 | variables.rs:431:8:431:9 | b2 |
-| variables.rs:424:9:424:9 | x | variables.rs:424:9:424:9 | x | variables.rs:426:19:426:19 | x |
-| variables.rs:424:9:424:9 | x | variables.rs:424:9:424:9 | x | variables.rs:428:19:428:19 | x |
-| variables.rs:458:14:458:14 | x | variables.rs:458:14:458:14 | x | variables.rs:459:16:459:16 | x |
-| variables.rs:463:9:463:9 | x | variables.rs:463:9:463:9 | x | variables.rs:465:15:465:15 | x |
+| 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:435:8:435:8 | b | variables.rs:435:8:435:8 | b | variables.rs:439:8:439:8 | b |
+| variables.rs:436:9:436:13 | x | variables.rs:436:13:436:13 | x | variables.rs:437:15:437:15 | x |
+| variables.rs:439:5:447:5 | phi | variables.rs:436:13:436:13 | x | variables.rs:448:15:448:15 | x |
+| variables.rs:440:9:440:9 | x | variables.rs:436:13:436:13 | x | variables.rs:441:19:441:19 | x |
+| variables.rs:444:9:444:9 | x | variables.rs:436:13:436:13 | x | variables.rs:445:19:445:19 | x |
+| variables.rs:451:13:451:14 | b1 | variables.rs:451:13:451:14 | b1 | variables.rs:453:8:453:9 | b1 |
+| variables.rs:451:24:451:25 | b2 | variables.rs:451:24:451:25 | b2 | variables.rs:459:8:459:9 | b2 |
+| variables.rs:452:9:452:9 | x | variables.rs:452:9:452:9 | x | variables.rs:454:19:454:19 | x |
+| variables.rs:452:9:452:9 | x | variables.rs:452:9:452:9 | x | variables.rs:456:19:456:19 | x |
+| variables.rs:487:9:487:9 | x | variables.rs:487:9:487:9 | x | variables.rs:489:15:489: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:12:9:12:10 | x1 | variables.rs:12:9:12:10 | x1 | variables.rs:13:15:13:16 | x1 |
-| variables.rs:17:9:17:14 | x2 | variables.rs:17:13:17:14 | x2 | variables.rs:18:15:18:16 | x2 |
-| variables.rs:19:5:19:6 | x2 | variables.rs:17:13:17:14 | x2 | variables.rs:20:15:20:16 | x2 |
-| variables.rs:24:9:24:10 | x3 | variables.rs:24:9:24:10 | x3 | variables.rs:27:9:27:10 | x3 |
-| variables.rs:26:9:26:10 | x3 | variables.rs:26:9:26:10 | x3 | variables.rs:28:15:28:16 | x3 |
-| variables.rs:32:9:32:10 | x4 | variables.rs:32:9:32:10 | x4 | variables.rs:38:15:38:16 | x4 |
-| variables.rs:35:13:35:14 | x4 | variables.rs:35:13:35:14 | x4 | variables.rs:36:19:36:20 | x4 |
-| variables.rs:49:13:49:14 | a1 | variables.rs:49:13:49:14 | a1 | variables.rs:57:15:57:16 | a1 |
-| variables.rs:50:13:50:14 | b1 | variables.rs:50:13:50:14 | b1 | variables.rs:58:15:58:16 | b1 |
-| variables.rs:53:13:53:13 | x | variables.rs:53:13:53:13 | x | variables.rs:59:15:59:15 | x |
-| variables.rs:54:13:54:13 | y | variables.rs:54:13:54:13 | y | variables.rs:60:15:60:15 | y |
-| variables.rs:64:9:64:10 | p1 | variables.rs:64:9:64:10 | p1 | variables.rs:68:9:68:10 | p1 |
-| variables.rs:66:12:66:13 | a2 | variables.rs:66:12:66:13 | a2 | variables.rs:69:15:69:16 | a2 |
-| variables.rs:67:12:67:13 | b2 | variables.rs:67:12:67:13 | b2 | variables.rs:70:15:70:16 | b2 |
-| variables.rs:74:9:74:10 | s1 | variables.rs:74:9:74:10 | s1 | variables.rs:77:11:77:12 | s1 |
-| variables.rs:76:17:76:22 | s2 | variables.rs:76:21:76:22 | s2 | variables.rs:78:19:78:20 | s2 |
-| variables.rs:83:14:83:15 | x5 | variables.rs:83:14:83:15 | x5 | variables.rs:87:15:87:16 | x5 |
-| variables.rs:91:9:91:10 | s1 | variables.rs:91:9:91:10 | s1 | variables.rs:94:11:94:12 | s1 |
-| variables.rs:93:20:93:25 | s2 | variables.rs:93:24:93:25 | s2 | variables.rs:95:19:95:20 | s2 |
-| variables.rs:100:9:100:10 | x6 | variables.rs:100:9:100:10 | x6 | variables.rs:103:11:103:12 | x6 |
-| variables.rs:101:9:101:10 | y1 | variables.rs:101:9:101:10 | y1 | variables.rs:113:15:113:16 | y1 |
-| variables.rs:105:14:105:15 | y1 | variables.rs:105:14:105:15 | y1 | variables.rs:108:23:108:24 | y1 |
-| variables.rs:117:9:117:15 | numbers | variables.rs:117:9:117:15 | numbers | variables.rs:131:11:131:17 | numbers |
-| variables.rs:121:13:121:17 | first | variables.rs:121:13:121:17 | first | variables.rs:125:23:125:27 | first |
-| variables.rs:122:13:122:17 | third | variables.rs:122:13:122:17 | third | variables.rs:126:23:126:27 | third |
-| variables.rs:123:13:123:17 | fifth | variables.rs:123:13:123:17 | fifth | variables.rs:127:23:127:27 | fifth |
-| variables.rs:133:13:133:17 | first | variables.rs:133:13:133:17 | first | variables.rs:137:23:137:27 | first |
-| variables.rs:135:13:135:16 | last | variables.rs:135:13:135:16 | last | variables.rs:138:23:138:26 | last |
-| variables.rs:144:9:144:10 | p2 | variables.rs:144:9:144:10 | p2 | variables.rs:146:11:146:12 | p2 |
-| variables.rs:148:16:148:17 | x7 | variables.rs:148:16:148:17 | x7 | variables.rs:149:24:149:25 | x7 |
-| variables.rs:158:9:158:11 | msg | variables.rs:158:9:158:11 | msg | variables.rs:160:11:160:13 | msg |
-| variables.rs:162:17:162:35 | [match(true)] id_variable | variables.rs:162:17:162:27 | id_variable | variables.rs:163:24:163:34 | id_variable |
-| variables.rs:167:26:167:27 | id | variables.rs:167:26:167:27 | id | variables.rs:168:23:168:24 | id |
-| variables.rs:178:9:178:14 | either | variables.rs:178:9:178:14 | either | variables.rs:179:11:179:16 | either |
-| variables.rs:180:9:180:44 | [match(true)] phi | variables.rs:180:9:180:44 | a3 | variables.rs:181:26:181:27 | a3 |
-| variables.rs:192:9:192:10 | tv | variables.rs:192:9:192:10 | tv | variables.rs:201:11:201:12 | tv |
-| variables.rs:194:9:194:81 | [match(true)] phi | variables.rs:194:9:194:81 | a4 | variables.rs:195:26:195:27 | a4 |
-| variables.rs:198:9:198:83 | [match(true)] phi | variables.rs:198:9:198:83 | a5 | variables.rs:199:26:199:27 | a5 |
-| variables.rs:202:9:202:83 | [match(true)] phi | variables.rs:202:9:202:83 | a6 | variables.rs:203:26:203:27 | a6 |
-| variables.rs:208:9:208:14 | either | variables.rs:208:9:208:14 | either | variables.rs:209:11:209:16 | either |
-| variables.rs:210:9:210:44 | [match(true)] phi | variables.rs:210:9:210:44 | a7 | variables.rs:211:16:211:17 | a7 |
-| variables.rs:210:9:210:44 | [match(true)] phi | variables.rs:210:9:210:44 | a7 | variables.rs:212:26:212:27 | a7 |
-| variables.rs:218:9:218:14 | either | variables.rs:218:9:218:14 | either | variables.rs:220:11:220:16 | either |
-| variables.rs:221:9:222:52 | [match(true)] e | variables.rs:221:13:221:13 | e | variables.rs:226:15:226:15 | e |
-| variables.rs:222:14:222:51 | [match(true)] phi | variables.rs:222:14:222:51 | a11 | variables.rs:224:23:224:25 | a11 |
-| variables.rs:225:33:225:35 | a12 | variables.rs:225:33:225:35 | a12 | variables.rs:227:28:227:30 | a12 |
-| variables.rs:242:9:242:10 | fv | variables.rs:242:9:242:10 | fv | variables.rs:243:11:243:12 | fv |
-| variables.rs:244:9:244:109 | [match(true)] phi | variables.rs:244:9:244:109 | a13 | variables.rs:245:26:245:28 | a13 |
-| variables.rs:250:5:250:6 | a8 | variables.rs:250:5:250:6 | a8 | variables.rs:255:15:255:16 | a8 |
-| variables.rs:252:9:252:10 | b3 | variables.rs:252:9:252:10 | b3 | variables.rs:256:15:256:16 | b3 |
-| variables.rs:253:9:253:10 | c1 | variables.rs:253:9:253:10 | c1 | variables.rs:257:15:257:16 | c1 |
-| variables.rs:261:6:261:41 | [match(true)] phi | variables.rs:261:6:261:41 | a9 | variables.rs:263:15:263:16 | a9 |
-| variables.rs:268:9:268:15 | a10 | variables.rs:268:13:268:15 | a10 | variables.rs:272:15:272:17 | a10 |
-| variables.rs:269:9:269:14 | b4 | variables.rs:269:13:269:14 | b4 | variables.rs:273:15:273:16 | b4 |
-| variables.rs:270:9:270:14 | c2 | variables.rs:270:13:270:14 | c2 | variables.rs:274:15:274:16 | c2 |
-| variables.rs:277:9:277:10 | c2 | variables.rs:270:13:270:14 | c2 | variables.rs:287:15:287:16 | c2 |
-| variables.rs:278:9:278:10 | b4 | variables.rs:269:13:269:14 | b4 | variables.rs:300:15:300:16 | b4 |
-| variables.rs:279:9:279:11 | a10 | variables.rs:268:13:268:15 | a10 | variables.rs:299:15:299:17 | a10 |
-| variables.rs:291:13:291:15 | a10 | variables.rs:291:13:291:15 | a10 | variables.rs:294:23:294:25 | a10 |
-| variables.rs:292:13:292:14 | b4 | variables.rs:292:13:292:14 | b4 | variables.rs:295:23:295:24 | b4 |
-| variables.rs:304:9:304:23 | example_closure | variables.rs:304:9:304:23 | example_closure | variables.rs:308:9:308:23 | example_closure |
-| variables.rs:305:10:305:10 | x | variables.rs:305:10:305:10 | x | variables.rs:306:9:306:9 | x |
-| variables.rs:307:9:307:10 | n1 | variables.rs:307:9:307:10 | n1 | variables.rs:309:15:309:16 | n1 |
-| variables.rs:312:9:312:26 | immutable_variable | variables.rs:312:9:312:26 | immutable_variable | variables.rs:316:9:316:26 | immutable_variable |
-| variables.rs:313:10:313:10 | x | variables.rs:313:10:313:10 | x | variables.rs:314:9:314:9 | x |
-| variables.rs:315:9:315:10 | n2 | variables.rs:315:9:315:10 | n2 | variables.rs:317:15:317:16 | n2 |
-| variables.rs:321:9:321:9 | v | variables.rs:321:9:321:9 | v | variables.rs:324:12:324:12 | v |
-| variables.rs:323:9:323:12 | text | variables.rs:323:9:323:12 | text | variables.rs:325:19:325:22 | text |
-| variables.rs:339:9:339:13 | ref_i | variables.rs:339:9:339:13 | ref_i | variables.rs:341:6:341:10 | ref_i |
-| variables.rs:345:17:345:17 | x | variables.rs:345:17:345:17 | x | variables.rs:349:12:349:12 | x |
-| variables.rs:352:22:352:22 | x | variables.rs:352:22:352:22 | x | variables.rs:357:9:357:9 | x |
-| variables.rs:352:39:352:39 | y | variables.rs:352:39:352:39 | y | variables.rs:356:6:356:6 | y |
-| variables.rs:362:9:362:9 | y | variables.rs:362:9:362:9 | y | variables.rs:364:6:364:6 | y |
-| variables.rs:369:9:369:9 | w | variables.rs:369:9:369:9 | w | variables.rs:375:7:375:7 | w |
-| variables.rs:382:9:382:9 | y | variables.rs:382:9:382:9 | y | variables.rs:384:6:384:6 | y |
-| variables.rs:390:9:390:15 | cap | variables.rs:390:13:390:15 | cap | variables.rs:394:5:394:7 | cap |
-| variables.rs:399:9:399:9 | x | variables.rs:399:9:399:9 | x | variables.rs:404:15:404:15 | x |
-| variables.rs:400:9:400:15 | cap | variables.rs:400:13:400:15 | cap | variables.rs:403:5:403:7 | cap |
-| variables.rs:400:19:402:5 | <captured entry> x | variables.rs:399:9:399:9 | x | variables.rs:401:19:401:19 | x |
-| variables.rs:407:8:407:8 | b | variables.rs:407:8:407:8 | b | variables.rs:411:8:411:8 | b |
-| variables.rs:408:9:408:13 | x | variables.rs:408:13:408:13 | x | variables.rs:410:15:410:15 | x |
-| variables.rs:411:5:419:5 | phi | variables.rs:408:13:408:13 | x | variables.rs:420:15:420:15 | x |
-| variables.rs:412:9:412:9 | x | variables.rs:408:13:408:13 | x | variables.rs:414:19:414:19 | x |
-| variables.rs:416:9:416:9 | x | variables.rs:408:13:408:13 | x | variables.rs:418:19:418:19 | x |
-| variables.rs:423:13:423:14 | b1 | variables.rs:423:13:423:14 | b1 | variables.rs:425:8:425:9 | b1 |
-| variables.rs:423:24:423:25 | b2 | variables.rs:423:24:423:25 | b2 | variables.rs:431:8:431:9 | b2 |
-| variables.rs:424:9:424:9 | x | variables.rs:424:9:424:9 | x | variables.rs:432:19:432:19 | x |
-| variables.rs:424:9:424:9 | x | variables.rs:424:9:424:9 | x | variables.rs:434:19:434:19 | x |
-| variables.rs:458:14:458:14 | x | variables.rs:458:14:458:14 | x | variables.rs:459:16:459:16 | x |
-| variables.rs:463:9:463:9 | x | variables.rs:463:9:463:9 | x | variables.rs:465:15:465:15 | x |
+| 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:435:8:435:8 | b | variables.rs:435:8:435:8 | b | variables.rs:439:8:439:8 | b |
+| variables.rs:436:9:436:13 | x | variables.rs:436:13:436:13 | x | variables.rs:438:15:438:15 | x |
+| variables.rs:439:5:447:5 | phi | variables.rs:436:13:436:13 | x | variables.rs:448:15:448:15 | x |
+| variables.rs:440:9:440:9 | x | variables.rs:436:13:436:13 | x | variables.rs:442:19:442:19 | x |
+| variables.rs:444:9:444:9 | x | variables.rs:436:13:436:13 | x | variables.rs:446:19:446:19 | x |
+| variables.rs:451:13:451:14 | b1 | variables.rs:451:13:451:14 | b1 | variables.rs:453:8:453:9 | b1 |
+| variables.rs:451:24:451:25 | b2 | variables.rs:451:24:451:25 | b2 | variables.rs:459:8:459:9 | b2 |
+| variables.rs:452:9:452:9 | x | variables.rs:452:9:452:9 | x | variables.rs:460:19:460:19 | x |
+| variables.rs:452:9:452:9 | x | variables.rs:452:9:452:9 | x | variables.rs:462:19:462:19 | x |
+| variables.rs:487:9:487:9 | x | variables.rs:487:9:487:9 | x | variables.rs:489:15:489:15 | x |
 adjacentReads
-| variables.rs:24:9:24:10 | x3 | variables.rs:24:9:24:10 | x3 | variables.rs:25:15:25:16 | x3 | variables.rs:27:9:27:10 | x3 |
-| variables.rs:32:9:32:10 | x4 | variables.rs:32:9:32:10 | x4 | variables.rs:33:15:33:16 | x4 | variables.rs:38:15:38:16 | x4 |
-| variables.rs:91:9:91:10 | s1 | variables.rs:91:9:91:10 | s1 | variables.rs:94:11:94:12 | s1 | variables.rs:94:11:94:12 | s1 |
-| variables.rs:117:9:117:15 | numbers | variables.rs:117:9:117:15 | numbers | variables.rs:119:11:119:17 | numbers | variables.rs:131:11:131:17 | numbers |
-| variables.rs:192:9:192:10 | tv | variables.rs:192:9:192:10 | tv | variables.rs:193:11:193:12 | tv | variables.rs:197:11:197:12 | tv |
-| variables.rs:192:9:192:10 | tv | variables.rs:192:9:192:10 | tv | variables.rs:197:11:197:12 | tv | variables.rs:201:11:201:12 | tv |
-| variables.rs:210:9:210:44 | [match(true)] phi | variables.rs:210:9:210:44 | a7 | variables.rs:211:16:211:17 | a7 | variables.rs:212:26:212:27 | a7 |
-| variables.rs:277:9:277:10 | c2 | variables.rs:270:13:270:14 | c2 | variables.rs:283:9:283:10 | c2 | variables.rs:287:15:287:16 | c2 |
-| variables.rs:278:9:278:10 | b4 | variables.rs:269:13:269:14 | b4 | variables.rs:282:9:282:10 | b4 | variables.rs:286:15:286:16 | b4 |
-| variables.rs:278:9:278:10 | b4 | variables.rs:269:13:269:14 | b4 | variables.rs:286:15:286:16 | b4 | variables.rs:300:15:300:16 | b4 |
-| variables.rs:279:9:279:11 | a10 | variables.rs:268:13:268:15 | a10 | variables.rs:281:9:281:11 | a10 | variables.rs:285:15:285:17 | a10 |
-| variables.rs:279:9:279:11 | a10 | variables.rs:268:13:268:15 | a10 | variables.rs:285:15:285:17 | a10 | variables.rs:299:15:299:17 | a10 |
-| variables.rs:345:17:345:17 | x | variables.rs:345:17:345:17 | x | variables.rs:346:6:346:6 | x | variables.rs:347:10:347:10 | x |
-| variables.rs:345:17:345:17 | x | variables.rs:345:17:345:17 | x | variables.rs:347:10:347:10 | x | variables.rs:348:10:348:10 | x |
-| variables.rs:345:17:345:17 | x | variables.rs:345:17:345:17 | x | variables.rs:348:10:348:10 | x | variables.rs:349:12:349:12 | x |
-| variables.rs:352:22:352:22 | x | variables.rs:352:22:352:22 | x | variables.rs:353:6:353:6 | x | variables.rs:354:10:354:10 | x |
-| variables.rs:352:22:352:22 | x | variables.rs:352:22:352:22 | x | variables.rs:354:10:354:10 | x | variables.rs:355:10:355:10 | x |
-| variables.rs:352:22:352:22 | x | variables.rs:352:22:352:22 | x | variables.rs:355:10:355:10 | x | variables.rs:357:9:357:9 | x |
-| variables.rs:369:9:369:9 | w | variables.rs:369:9:369:9 | w | variables.rs:373:9:373:9 | w | variables.rs:375:7:375:7 | w |
-| variables.rs:408:9:408:13 | x | variables.rs:408:13:408:13 | x | variables.rs:409:15:409:15 | x | variables.rs:410:15:410:15 | x |
-| variables.rs:412:9:412:9 | x | variables.rs:408:13:408:13 | x | variables.rs:413:19:413:19 | x | variables.rs:414:19:414:19 | x |
-| variables.rs:416:9:416:9 | x | variables.rs:408:13:408:13 | x | variables.rs:417:19:417:19 | x | variables.rs:418:19:418:19 | x |
-| variables.rs:424:9:424:9 | x | variables.rs:424:9:424:9 | x | variables.rs:426:19:426:19 | x | variables.rs:432:19:432:19 | x |
-| variables.rs:424:9:424:9 | x | variables.rs:424:9:424:9 | x | variables.rs:426:19:426:19 | x | variables.rs:434:19:434:19 | x |
-| variables.rs:424:9:424:9 | x | variables.rs:424:9:424:9 | x | variables.rs:428:19:428:19 | x | variables.rs:432:19:432:19 | x |
-| variables.rs:424:9:424:9 | x | variables.rs:424:9:424:9 | x | variables.rs:428:19:428:19 | x | variables.rs:434:19:434:19 | x |
+| 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:436:9:436:13 | x | variables.rs:436:13:436:13 | x | variables.rs:437:15:437:15 | x | variables.rs:438:15:438:15 | x |
+| variables.rs:440:9:440:9 | x | variables.rs:436:13:436:13 | x | variables.rs:441:19:441:19 | x | variables.rs:442:19:442:19 | x |
+| variables.rs:444:9:444:9 | x | variables.rs:436:13:436:13 | x | variables.rs:445:19:445:19 | x | variables.rs:446:19:446:19 | x |
+| variables.rs:452:9:452:9 | x | variables.rs:452:9:452:9 | x | variables.rs:454:19:454:19 | x | variables.rs:460:19:460:19 | x |
+| variables.rs:452:9:452:9 | x | variables.rs:452:9:452:9 | x | variables.rs:454:19:454:19 | x | variables.rs:462:19:462:19 | x |
+| variables.rs:452:9:452:9 | x | variables.rs:452:9:452:9 | x | variables.rs:456:19:456:19 | x | variables.rs:460:19:460:19 | x |
+| variables.rs:452:9:452:9 | x | variables.rs:452:9:452:9 | x | variables.rs:456:19:456:19 | x | variables.rs:462:19:462:19 | x |
 phi
-| variables.rs:180:9:180:44 | [match(true)] phi | variables.rs:180:9:180:44 | a3 | variables.rs:180:22:180:23 | a3 |
-| variables.rs:180:9:180:44 | [match(true)] phi | variables.rs:180:9:180:44 | a3 | variables.rs:180:42:180:43 | a3 |
-| variables.rs:194:9:194:81 | [match(true)] phi | variables.rs:194:9:194:81 | a4 | variables.rs:194:28:194:29 | a4 |
-| variables.rs:194:9:194:81 | [match(true)] phi | variables.rs:194:9:194:81 | a4 | variables.rs:194:54:194:55 | a4 |
-| variables.rs:194:9:194:81 | [match(true)] phi | variables.rs:194:9:194:81 | a4 | variables.rs:194:79:194:80 | a4 |
-| variables.rs:198:9:198:83 | [match(true)] phi | variables.rs:198:9:198:83 | a5 | variables.rs:198:10:198:57 | [match(true)] phi |
-| variables.rs:198:9:198:83 | [match(true)] phi | variables.rs:198:9:198:83 | a5 | variables.rs:198:81:198:82 | a5 |
-| variables.rs:198:10:198:57 | [match(true)] phi | variables.rs:198:9:198:83 | a5 | variables.rs:198:29:198:30 | a5 |
-| variables.rs:198:10:198:57 | [match(true)] phi | variables.rs:198:9:198:83 | a5 | variables.rs:198:55:198:56 | a5 |
-| variables.rs:202:9:202:83 | [match(true)] phi | variables.rs:202:9:202:83 | a6 | variables.rs:202:28:202:29 | a6 |
-| variables.rs:202:9:202:83 | [match(true)] phi | variables.rs:202:9:202:83 | a6 | variables.rs:202:35:202:82 | [match(true)] phi |
-| variables.rs:202:35:202:82 | [match(true)] phi | variables.rs:202:9:202:83 | a6 | variables.rs:202:55:202:56 | a6 |
-| variables.rs:202:35:202:82 | [match(true)] phi | variables.rs:202:9:202:83 | a6 | variables.rs:202:80:202:81 | a6 |
-| variables.rs:210:9:210:44 | [match(true)] phi | variables.rs:210:9:210:44 | a7 | variables.rs:210:22:210:23 | a7 |
-| variables.rs:210:9:210:44 | [match(true)] phi | variables.rs:210:9:210:44 | a7 | variables.rs:210:42:210:43 | a7 |
-| variables.rs:222:14:222:51 | [match(true)] phi | variables.rs:222:14:222:51 | a11 | variables.rs:222:27:222:29 | a11 |
-| variables.rs:222:14:222:51 | [match(true)] phi | variables.rs:222:14:222:51 | a11 | variables.rs:222:48:222:50 | a11 |
-| variables.rs:244:9:244:109 | [match(true)] phi | variables.rs:244:9:244:109 | a13 | variables.rs:244:27:244:29 | a13 |
-| variables.rs:244:9:244:109 | [match(true)] phi | variables.rs:244:9:244:109 | a13 | variables.rs:244:35:244:82 | [match(true)] phi |
-| variables.rs:244:9:244:109 | [match(true)] phi | variables.rs:244:9:244:109 | a13 | variables.rs:244:106:244:108 | a13 |
-| variables.rs:244:35:244:82 | [match(true)] phi | variables.rs:244:9:244:109 | a13 | variables.rs:244:54:244:56 | a13 |
-| variables.rs:244:35:244:82 | [match(true)] phi | variables.rs:244:9:244:109 | a13 | variables.rs:244:79:244:81 | a13 |
-| variables.rs:261:6:261:41 | [match(true)] phi | variables.rs:261:6:261:41 | a9 | variables.rs:261:19:261:20 | a9 |
-| variables.rs:261:6:261:41 | [match(true)] phi | variables.rs:261:6:261:41 | a9 | variables.rs:261:39:261:40 | a9 |
-| variables.rs:411:5:419:5 | phi | variables.rs:408:13:408:13 | x | variables.rs:412:9:412:9 | x |
-| variables.rs:411:5:419:5 | phi | variables.rs:408:13:408:13 | x | variables.rs:416:9:416:9 | x |
+| 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:439:5:447:5 | phi | variables.rs:436:13:436:13 | x | variables.rs:440:9:440:9 | x |
+| variables.rs:439:5:447:5 | phi | variables.rs:436:13:436:13 | x | variables.rs:444:9:444:9 | x |
 phiReadNode
-| variables.rs:93:11:94:12 | SSA phi read(s1) | variables.rs:91:9:91:10 | s1 |
-| variables.rs:425:5:429:5 | SSA phi read(x) | variables.rs:424:9:424:9 | x |
+| variables.rs:104:11:105:12 | SSA phi read(s1) | variables.rs:102:9:102:10 | s1 |
+| variables.rs:453:5:457:5 | SSA phi read(x) | variables.rs:452:9:452:9 | x |
 phiReadNodeRead
-| variables.rs:93:11:94:12 | SSA phi read(s1) | variables.rs:91:9:91:10 | s1 | variables.rs:94:11:94:12 | s1 |
-| variables.rs:425:5:429:5 | SSA phi read(x) | variables.rs:424:9:424:9 | x | variables.rs:432:19:432:19 | x |
-| variables.rs:425:5:429:5 | SSA phi read(x) | variables.rs:424:9:424:9 | x | variables.rs:434:19:434:19 | x |
+| 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:453:5:457:5 | SSA phi read(x) | variables.rs:452:9:452:9 | x | variables.rs:460:19:460:19 | x |
+| variables.rs:453:5:457:5 | SSA phi read(x) | variables.rs:452:9:452:9 | x | variables.rs:462:19:462:19 | x |
 phiReadInput
-| variables.rs:93:11:94:12 | SSA phi read(s1) | variables.rs:91:9:91:10 | s1 |
-| variables.rs:93:11:94:12 | SSA phi read(s1) | variables.rs:93:11:94:12 | SSA phi read(s1) |
-| variables.rs:425:5:429:5 | SSA phi read(x) | variables.rs:424:9:424:9 | x |
+| 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:453:5:457:5 | SSA phi read(x) | variables.rs:452:9:452:9 | x |
 ultimateDef
-| variables.rs:180:9:180:44 | [match(true)] phi | variables.rs:180:22:180:23 | a3 |
-| variables.rs:180:9:180:44 | [match(true)] phi | variables.rs:180:42:180:43 | a3 |
-| variables.rs:194:9:194:81 | [match(true)] phi | variables.rs:194:28:194:29 | a4 |
-| variables.rs:194:9:194:81 | [match(true)] phi | variables.rs:194:54:194:55 | a4 |
-| variables.rs:194:9:194:81 | [match(true)] phi | variables.rs:194:79:194:80 | a4 |
-| variables.rs:198:9:198:83 | [match(true)] phi | variables.rs:198:29:198:30 | a5 |
-| variables.rs:198:9:198:83 | [match(true)] phi | variables.rs:198:55:198:56 | a5 |
-| variables.rs:198:9:198:83 | [match(true)] phi | variables.rs:198:81:198:82 | a5 |
-| variables.rs:198:10:198:57 | [match(true)] phi | variables.rs:198:29:198:30 | a5 |
-| variables.rs:198:10:198:57 | [match(true)] phi | variables.rs:198:55:198:56 | a5 |
-| variables.rs:202:9:202:83 | [match(true)] phi | variables.rs:202:28:202:29 | a6 |
-| variables.rs:202:9:202:83 | [match(true)] phi | variables.rs:202:55:202:56 | a6 |
-| variables.rs:202:9:202:83 | [match(true)] phi | variables.rs:202:80:202:81 | a6 |
-| variables.rs:202:35:202:82 | [match(true)] phi | variables.rs:202:55:202:56 | a6 |
-| variables.rs:202:35:202:82 | [match(true)] phi | variables.rs:202:80:202:81 | a6 |
-| variables.rs:210:9:210:44 | [match(true)] phi | variables.rs:210:22:210:23 | a7 |
-| variables.rs:210:9:210:44 | [match(true)] phi | variables.rs:210:42:210:43 | a7 |
-| variables.rs:222:14:222:51 | [match(true)] phi | variables.rs:222:27:222:29 | a11 |
-| variables.rs:222:14:222:51 | [match(true)] phi | variables.rs:222:48:222:50 | a11 |
-| variables.rs:244:9:244:109 | [match(true)] phi | variables.rs:244:27:244:29 | a13 |
-| variables.rs:244:9:244:109 | [match(true)] phi | variables.rs:244:54:244:56 | a13 |
-| variables.rs:244:9:244:109 | [match(true)] phi | variables.rs:244:79:244:81 | a13 |
-| variables.rs:244:9:244:109 | [match(true)] phi | variables.rs:244:106:244:108 | a13 |
-| variables.rs:244:35:244:82 | [match(true)] phi | variables.rs:244:54:244:56 | a13 |
-| variables.rs:244:35:244:82 | [match(true)] phi | variables.rs:244:79:244:81 | a13 |
-| variables.rs:261:6:261:41 | [match(true)] phi | variables.rs:261:19:261:20 | a9 |
-| variables.rs:261:6:261:41 | [match(true)] phi | variables.rs:261:39:261:40 | a9 |
-| variables.rs:411:5:419:5 | phi | variables.rs:412:9:412:9 | x |
-| variables.rs:411:5:419:5 | phi | variables.rs:416:9:416:9 | x |
+| 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:439:5:447:5 | phi | variables.rs:440:9:440:9 | x |
+| variables.rs:439:5:447:5 | phi | variables.rs:444:9:444:9 | x |
 assigns
-| variables.rs:19:5:19:6 | x2 | variables.rs:19:10:19:10 | 5 |
-| variables.rs:412:9:412:9 | x | variables.rs:412:13:412:13 | 2 |
-| variables.rs:416:9:416:9 | x | variables.rs:416:13:416:13 | 3 |
+| 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:440:9:440:9 | x | variables.rs:440:13:440:13 | 2 |
+| variables.rs:444:9:444:9 | x | variables.rs:444:13:444:13 | 3 |
diff --git a/rust/ql/test/library-tests/variables/variables.expected b/rust/ql/test/library-tests/variables/variables.expected
index aad2c9e40f9..53245eacea0 100644
--- a/rust/ql/test/library-tests/variables/variables.expected
+++ b/rust/ql/test/library-tests/variables/variables.expected
@@ -3,426 +3,454 @@ failures
 variable
 | variables.rs:3:14:3:14 | s |
 | variables.rs:7:14:7:14 | i |
-| variables.rs:12:9:12:10 | x1 |
-| variables.rs:17:13:17:14 | x2 |
-| variables.rs:24:9:24:10 | x3 |
-| variables.rs:26:9:26:10 | x3 |
-| variables.rs:32:9:32:10 | x4 |
-| variables.rs:35:13:35:14 | x4 |
-| variables.rs:49:13:49:14 | a1 |
-| variables.rs:50:13:50:14 | b1 |
-| variables.rs:53:13:53:13 | x |
-| variables.rs:54:13:54:13 | y |
-| variables.rs:64:9:64:10 | p1 |
-| variables.rs:66:12:66:13 | a2 |
-| variables.rs:67:12:67:13 | b2 |
-| variables.rs:74:9:74:10 | s1 |
-| variables.rs:76:21:76:22 | s2 |
-| variables.rs:83:14:83:15 | x5 |
-| variables.rs:91:9:91:10 | s1 |
-| variables.rs:93:24:93:25 | s2 |
-| variables.rs:100:9:100:10 | x6 |
-| variables.rs:101:9:101:10 | y1 |
-| variables.rs:105:14:105:15 | y1 |
-| variables.rs:117:9:117:15 | numbers |
-| variables.rs:121:13:121:17 | first |
-| variables.rs:122:13:122:17 | third |
-| variables.rs:123:13:123:17 | fifth |
-| variables.rs:133:13:133:17 | first |
-| variables.rs:135:13:135:16 | last |
-| variables.rs:144:9:144:10 | p2 |
-| variables.rs:148:16:148:17 | x7 |
-| variables.rs:158:9:158:11 | msg |
-| variables.rs:162:17:162:27 | id_variable |
-| variables.rs:167:26:167:27 | id |
-| variables.rs:178:9:178:14 | either |
-| variables.rs:180:9:180:44 | a3 |
-| variables.rs:192:9:192:10 | tv |
-| variables.rs:194:9:194:81 | a4 |
-| variables.rs:198:9:198:83 | a5 |
-| variables.rs:202:9:202:83 | a6 |
-| variables.rs:208:9:208:14 | either |
-| variables.rs:210:9:210:44 | a7 |
-| variables.rs:218:9:218:14 | either |
-| variables.rs:221:13:221:13 | e |
-| variables.rs:222:14:222:51 | a11 |
-| variables.rs:225:33:225:35 | a12 |
-| variables.rs:242:9:242:10 | fv |
-| variables.rs:244:9:244:109 | a13 |
-| variables.rs:250:5:250:6 | a8 |
-| variables.rs:252:9:252:10 | b3 |
-| variables.rs:253:9:253:10 | c1 |
-| variables.rs:261:6:261:41 | a9 |
-| variables.rs:268:13:268:15 | a10 |
-| variables.rs:269:13:269:14 | b4 |
-| variables.rs:270:13:270:14 | c2 |
-| variables.rs:291:13:291:15 | a10 |
-| variables.rs:292:13:292:14 | b4 |
-| variables.rs:304:9:304:23 | example_closure |
-| variables.rs:305:10:305:10 | x |
-| variables.rs:307:9:307:10 | n1 |
-| variables.rs:312:9:312:26 | immutable_variable |
-| variables.rs:313:10:313:10 | x |
-| variables.rs:315:9:315:10 | n2 |
-| variables.rs:321:9:321:9 | v |
-| variables.rs:323:9:323:12 | text |
-| variables.rs:330:13:330:13 | a |
-| variables.rs:338:13:338:13 | i |
-| variables.rs:339:9:339:13 | ref_i |
-| variables.rs:345:17:345:17 | x |
-| variables.rs:352:22:352:22 | x |
-| variables.rs:352:39:352:39 | y |
-| variables.rs:361:13:361:13 | x |
-| variables.rs:362:9:362:9 | y |
-| variables.rs:368:13:368:13 | z |
-| variables.rs:369:9:369:9 | w |
-| variables.rs:381:13:381:13 | x |
-| variables.rs:382:9:382:9 | y |
-| variables.rs:389:13:389:13 | x |
-| variables.rs:390:13:390:15 | cap |
-| variables.rs:399:9:399:9 | x |
-| variables.rs:400:13:400:15 | cap |
-| variables.rs:407:8:407:8 | b |
-| variables.rs:408:13:408:13 | x |
-| variables.rs:423:13:423:14 | b1 |
-| variables.rs:423:24:423:25 | b2 |
-| variables.rs:424:9:424:9 | x |
-| variables.rs:450:13:450:13 | a |
-| variables.rs:458:14:458:14 | x |
-| variables.rs:463:9:463:9 | x |
-| variables.rs:467:9:467:9 | z |
-| variables.rs:482:11:482:11 | a |
+| 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:435:8:435:8 | b |
+| variables.rs:436:13:436:13 | x |
+| variables.rs:451:13:451:14 | b1 |
+| variables.rs:451:24:451:25 | b2 |
+| variables.rs:452:9:452:9 | x |
+| variables.rs:478:13:478:13 | a |
+| variables.rs:487:9:487:9 | x |
+| variables.rs:491:9:491:9 | z |
+| variables.rs:506:11:506: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:13:15:13:16 | x1 | variables.rs:12:9:12:10 | x1 |
-| variables.rs:18:15:18:16 | x2 | variables.rs:17:13:17:14 | x2 |
-| variables.rs:19:5:19:6 | x2 | variables.rs:17:13:17:14 | x2 |
-| variables.rs:20:15:20:16 | x2 | variables.rs:17:13:17:14 | x2 |
-| variables.rs:25:15:25:16 | x3 | variables.rs:24:9:24:10 | x3 |
-| variables.rs:27:9:27:10 | x3 | variables.rs:24:9:24:10 | x3 |
-| variables.rs:28:15:28:16 | x3 | variables.rs:26:9:26:10 | x3 |
-| variables.rs:33:15:33:16 | x4 | variables.rs:32:9:32:10 | x4 |
-| variables.rs:36:19:36:20 | x4 | variables.rs:35:13:35:14 | x4 |
-| variables.rs:38:15:38:16 | x4 | variables.rs:32:9:32:10 | x4 |
-| variables.rs:57:15:57:16 | a1 | variables.rs:49:13:49:14 | a1 |
-| variables.rs:58:15:58:16 | b1 | variables.rs:50:13:50:14 | b1 |
-| variables.rs:59:15:59:15 | x | variables.rs:53:13:53:13 | x |
-| variables.rs:60:15:60:15 | y | variables.rs:54:13:54:13 | y |
-| variables.rs:68:9:68:10 | p1 | variables.rs:64:9:64:10 | p1 |
-| variables.rs:69:15:69:16 | a2 | variables.rs:66:12:66:13 | a2 |
-| variables.rs:70:15:70:16 | b2 | variables.rs:67:12:67:13 | b2 |
-| variables.rs:77:11:77:12 | s1 | variables.rs:74:9:74:10 | s1 |
-| variables.rs:78:19:78:20 | s2 | variables.rs:76:21:76:22 | s2 |
-| variables.rs:87:15:87:16 | x5 | variables.rs:83:14:83:15 | x5 |
-| variables.rs:94:11:94:12 | s1 | variables.rs:91:9:91:10 | s1 |
-| variables.rs:95:19:95:20 | s2 | variables.rs:93:24:93:25 | s2 |
-| variables.rs:103:11:103:12 | x6 | variables.rs:100:9:100:10 | x6 |
-| variables.rs:108:23:108:24 | y1 | variables.rs:105:14:105:15 | y1 |
-| variables.rs:113:15:113:16 | y1 | variables.rs:101:9:101:10 | y1 |
-| variables.rs:119:11:119:17 | numbers | variables.rs:117:9:117:15 | numbers |
-| variables.rs:125:23:125:27 | first | variables.rs:121:13:121:17 | first |
-| variables.rs:126:23:126:27 | third | variables.rs:122:13:122:17 | third |
-| variables.rs:127:23:127:27 | fifth | variables.rs:123:13:123:17 | fifth |
-| variables.rs:131:11:131:17 | numbers | variables.rs:117:9:117:15 | numbers |
-| variables.rs:137:23:137:27 | first | variables.rs:133:13:133:17 | first |
-| variables.rs:138:23:138:26 | last | variables.rs:135:13:135:16 | last |
-| variables.rs:146:11:146:12 | p2 | variables.rs:144:9:144:10 | p2 |
-| variables.rs:149:24:149:25 | x7 | variables.rs:148:16:148:17 | x7 |
-| variables.rs:160:11:160:13 | msg | variables.rs:158:9:158:11 | msg |
-| variables.rs:163:24:163:34 | id_variable | variables.rs:162:17:162:27 | id_variable |
-| variables.rs:168:23:168:24 | id | variables.rs:167:26:167:27 | id |
-| variables.rs:179:11:179:16 | either | variables.rs:178:9:178:14 | either |
-| variables.rs:181:26:181:27 | a3 | variables.rs:180:9:180:44 | a3 |
-| variables.rs:193:11:193:12 | tv | variables.rs:192:9:192:10 | tv |
-| variables.rs:195:26:195:27 | a4 | variables.rs:194:9:194:81 | a4 |
-| variables.rs:197:11:197:12 | tv | variables.rs:192:9:192:10 | tv |
-| variables.rs:199:26:199:27 | a5 | variables.rs:198:9:198:83 | a5 |
-| variables.rs:201:11:201:12 | tv | variables.rs:192:9:192:10 | tv |
-| variables.rs:203:26:203:27 | a6 | variables.rs:202:9:202:83 | a6 |
-| variables.rs:209:11:209:16 | either | variables.rs:208:9:208:14 | either |
-| variables.rs:211:16:211:17 | a7 | variables.rs:210:9:210:44 | a7 |
-| variables.rs:212:26:212:27 | a7 | variables.rs:210:9:210:44 | a7 |
-| variables.rs:220:11:220:16 | either | variables.rs:218:9:218:14 | either |
-| variables.rs:224:23:224:25 | a11 | variables.rs:222:14:222:51 | a11 |
-| variables.rs:226:15:226:15 | e | variables.rs:221:13:221:13 | e |
-| variables.rs:227:28:227:30 | a12 | variables.rs:225:33:225:35 | a12 |
-| variables.rs:243:11:243:12 | fv | variables.rs:242:9:242:10 | fv |
-| variables.rs:245:26:245:28 | a13 | variables.rs:244:9:244:109 | a13 |
-| variables.rs:255:15:255:16 | a8 | variables.rs:250:5:250:6 | a8 |
-| variables.rs:256:15:256:16 | b3 | variables.rs:252:9:252:10 | b3 |
-| variables.rs:257:15:257:16 | c1 | variables.rs:253:9:253:10 | c1 |
-| variables.rs:263:15:263:16 | a9 | variables.rs:261:6:261:41 | a9 |
-| variables.rs:272:15:272:17 | a10 | variables.rs:268:13:268:15 | a10 |
-| variables.rs:273:15:273:16 | b4 | variables.rs:269:13:269:14 | b4 |
-| variables.rs:274:15:274:16 | c2 | variables.rs:270:13:270:14 | c2 |
-| variables.rs:277:9:277:10 | c2 | variables.rs:270:13:270:14 | c2 |
-| variables.rs:278:9:278:10 | b4 | variables.rs:269:13:269:14 | b4 |
-| variables.rs:279:9:279:11 | a10 | variables.rs:268:13:268:15 | a10 |
-| variables.rs:281:9:281:11 | a10 | variables.rs:268:13:268:15 | a10 |
-| variables.rs:282:9:282:10 | b4 | variables.rs:269:13:269:14 | b4 |
-| variables.rs:283:9:283:10 | c2 | variables.rs:270:13:270:14 | c2 |
-| variables.rs:285:15:285:17 | a10 | variables.rs:268:13:268:15 | a10 |
-| variables.rs:286:15:286:16 | b4 | variables.rs:269:13:269:14 | b4 |
-| variables.rs:287:15:287:16 | c2 | variables.rs:270:13:270:14 | c2 |
-| variables.rs:294:23:294:25 | a10 | variables.rs:291:13:291:15 | a10 |
-| variables.rs:295:23:295:24 | b4 | variables.rs:292:13:292:14 | b4 |
-| variables.rs:299:15:299:17 | a10 | variables.rs:268:13:268:15 | a10 |
-| variables.rs:300:15:300:16 | b4 | variables.rs:269:13:269:14 | b4 |
-| variables.rs:306:9:306:9 | x | variables.rs:305:10:305:10 | x |
-| variables.rs:308:9:308:23 | example_closure | variables.rs:304:9:304:23 | example_closure |
-| variables.rs:309:15:309:16 | n1 | variables.rs:307:9:307:10 | n1 |
-| variables.rs:314:9:314:9 | x | variables.rs:313:10:313:10 | x |
-| variables.rs:316:9:316:26 | immutable_variable | variables.rs:312:9:312:26 | immutable_variable |
-| variables.rs:317:15:317:16 | n2 | variables.rs:315:9:315:10 | n2 |
-| variables.rs:324:12:324:12 | v | variables.rs:321:9:321:9 | v |
-| variables.rs:325:19:325:22 | text | variables.rs:323:9:323:12 | text |
-| variables.rs:331:5:331:5 | a | variables.rs:330:13:330:13 | a |
-| variables.rs:332:15:332:15 | a | variables.rs:330:13:330:13 | a |
-| variables.rs:333:11:333:11 | a | variables.rs:330:13:330:13 | a |
-| variables.rs:334:15:334:15 | a | variables.rs:330:13:330:13 | a |
-| variables.rs:340:14:340:14 | i | variables.rs:338:13:338:13 | i |
-| variables.rs:341:6:341:10 | ref_i | variables.rs:339:9:339:13 | ref_i |
-| variables.rs:342:15:342:15 | i | variables.rs:338:13:338:13 | i |
-| variables.rs:346:6:346:6 | x | variables.rs:345:17:345:17 | x |
-| variables.rs:347:10:347:10 | x | variables.rs:345:17:345:17 | x |
-| variables.rs:348:10:348:10 | x | variables.rs:345:17:345:17 | x |
-| variables.rs:349:12:349:12 | x | variables.rs:345:17:345:17 | x |
-| variables.rs:353:6:353:6 | x | variables.rs:352:22:352:22 | x |
-| variables.rs:354:10:354:10 | x | variables.rs:352:22:352:22 | x |
-| variables.rs:355:10:355:10 | x | variables.rs:352:22:352:22 | x |
-| variables.rs:356:6:356:6 | y | variables.rs:352:39:352:39 | y |
-| variables.rs:357:9:357:9 | x | variables.rs:352:22:352:22 | x |
-| variables.rs:363:27:363:27 | x | variables.rs:361:13:361:13 | x |
-| variables.rs:364:6:364:6 | y | variables.rs:362:9:362:9 | y |
-| variables.rs:366:15:366:15 | x | variables.rs:361:13:361:13 | x |
-| variables.rs:370:19:370:19 | x | variables.rs:361:13:361:13 | x |
-| variables.rs:372:14:372:14 | z | variables.rs:368:13:368:13 | z |
-| variables.rs:373:9:373:9 | w | variables.rs:369:9:369:9 | w |
-| variables.rs:375:7:375:7 | w | variables.rs:369:9:369:9 | w |
-| variables.rs:377:15:377:15 | z | variables.rs:368:13:368:13 | z |
-| variables.rs:383:14:383:14 | x | variables.rs:381:13:381:13 | x |
-| variables.rs:384:6:384:6 | y | variables.rs:382:9:382:9 | y |
-| variables.rs:385:15:385:15 | x | variables.rs:381:13:381:13 | x |
-| variables.rs:391:19:391:19 | x | variables.rs:389:13:389:13 | x |
-| variables.rs:392:9:392:9 | x | variables.rs:389:13:389:13 | x |
-| variables.rs:394:5:394:7 | cap | variables.rs:390:13:390:15 | cap |
-| variables.rs:395:15:395:15 | x | variables.rs:389:13:389:13 | x |
-| variables.rs:401:19:401:19 | x | variables.rs:399:9:399:9 | x |
-| variables.rs:403:5:403:7 | cap | variables.rs:400:13:400:15 | cap |
-| variables.rs:404:15:404:15 | x | variables.rs:399:9:399:9 | x |
-| variables.rs:409:15:409:15 | x | variables.rs:408:13:408:13 | x |
-| variables.rs:410:15:410:15 | x | variables.rs:408:13:408:13 | x |
-| variables.rs:411:8:411:8 | b | variables.rs:407:8:407:8 | b |
-| variables.rs:412:9:412:9 | x | variables.rs:408:13:408:13 | x |
-| variables.rs:413:19:413:19 | x | variables.rs:408:13:408:13 | x |
-| variables.rs:414:19:414:19 | x | variables.rs:408:13:408:13 | x |
-| variables.rs:416:9:416:9 | x | variables.rs:408:13:408:13 | x |
-| variables.rs:417:19:417:19 | x | variables.rs:408:13:408:13 | x |
-| variables.rs:418:19:418:19 | x | variables.rs:408:13:408:13 | x |
-| variables.rs:420:15:420:15 | x | variables.rs:408:13:408:13 | x |
-| variables.rs:425:8:425:9 | b1 | variables.rs:423:13:423:14 | b1 |
-| variables.rs:426:19:426:19 | x | variables.rs:424:9:424:9 | x |
-| variables.rs:428:19:428:19 | x | variables.rs:424:9:424:9 | x |
-| variables.rs:431:8:431:9 | b2 | variables.rs:423:24:423:25 | b2 |
-| variables.rs:432:19:432:19 | x | variables.rs:424:9:424:9 | x |
-| variables.rs:434:19:434:19 | x | variables.rs:424:9:424:9 | x |
-| variables.rs:451:15:451:15 | a | variables.rs:450:13:450:13 | a |
-| variables.rs:452:5:452:5 | a | variables.rs:450:13:450:13 | a |
-| variables.rs:453:15:453:15 | a | variables.rs:450:13:450:13 | a |
-| variables.rs:454:5:454:5 | a | variables.rs:450:13:450:13 | a |
-| variables.rs:455:15:455:15 | a | variables.rs:450:13:450:13 | a |
-| variables.rs:459:16:459:16 | x | variables.rs:458:14:458:14 | x |
-| variables.rs:464:16:464:16 | x | variables.rs:463:9:463:9 | x |
-| variables.rs:465:15:465:15 | x | variables.rs:463:9:463:9 | x |
-| variables.rs:468:16:468:16 | z | variables.rs:467:9:467:9 | z |
-| variables.rs:483:3:483:3 | a | variables.rs:482:11:482:11 | a |
-| variables.rs:485:13:485:13 | a | variables.rs:482:11:482:11 | a |
+| 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:437:15:437:15 | x | variables.rs:436:13:436:13 | x |
+| variables.rs:438:15:438:15 | x | variables.rs:436:13:436:13 | x |
+| variables.rs:439:8:439:8 | b | variables.rs:435:8:435:8 | b |
+| variables.rs:440:9:440:9 | x | variables.rs:436:13:436:13 | x |
+| variables.rs:441:19:441:19 | x | variables.rs:436:13:436:13 | x |
+| variables.rs:442:19:442:19 | x | variables.rs:436:13:436:13 | x |
+| variables.rs:444:9:444:9 | x | variables.rs:436:13:436:13 | x |
+| variables.rs:445:19:445:19 | x | variables.rs:436:13:436:13 | x |
+| variables.rs:446:19:446:19 | x | variables.rs:436:13:436:13 | x |
+| variables.rs:448:15:448:15 | x | variables.rs:436:13:436:13 | x |
+| variables.rs:453:8:453:9 | b1 | variables.rs:451:13:451:14 | b1 |
+| variables.rs:454:19:454:19 | x | variables.rs:452:9:452:9 | x |
+| variables.rs:456:19:456:19 | x | variables.rs:452:9:452:9 | x |
+| variables.rs:459:8:459:9 | b2 | variables.rs:451:24:451:25 | b2 |
+| variables.rs:460:19:460:19 | x | variables.rs:452:9:452:9 | x |
+| variables.rs:462:19:462:19 | x | variables.rs:452:9:452:9 | x |
+| variables.rs:479:15:479:15 | a | variables.rs:478:13:478:13 | a |
+| variables.rs:480:5:480:5 | a | variables.rs:478:13:478:13 | a |
+| variables.rs:481:15:481:15 | a | variables.rs:478:13:478:13 | a |
+| variables.rs:482:5:482:5 | a | variables.rs:478:13:478:13 | a |
+| variables.rs:483:15:483:15 | a | variables.rs:478:13:478:13 | a |
+| variables.rs:488:20:488:20 | x | variables.rs:487:9:487:9 | x |
+| variables.rs:489:15:489:15 | x | variables.rs:487:9:487:9 | x |
+| variables.rs:492:20:492:20 | z | variables.rs:491:9:491:9 | z |
+| variables.rs:507:3:507:3 | a | variables.rs:506:11:506:11 | a |
+| variables.rs:509:13:509:13 | a | variables.rs:506:11:506:11 | a |
 variableWriteAccess
-| variables.rs:19:5:19:6 | x2 | variables.rs:17:13:17:14 | x2 |
-| variables.rs:277:9:277:10 | c2 | variables.rs:270:13:270:14 | c2 |
-| variables.rs:278:9:278:10 | b4 | variables.rs:269:13:269:14 | b4 |
-| variables.rs:279:9:279:11 | a10 | variables.rs:268:13:268:15 | a10 |
-| variables.rs:412:9:412:9 | x | variables.rs:408:13:408:13 | x |
-| variables.rs:416:9:416:9 | x | variables.rs:408:13:408:13 | x |
-| variables.rs:454:5:454:5 | a | variables.rs:450:13:450:13 | a |
+| 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:440:9:440:9 | x | variables.rs:436:13:436:13 | x |
+| variables.rs:444:9:444:9 | x | variables.rs:436:13:436:13 | x |
+| variables.rs:482:5:482:5 | a | variables.rs:478:13:478: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:13:15:13:16 | x1 | variables.rs:12:9:12:10 | x1 |
-| variables.rs:18:15:18:16 | x2 | variables.rs:17:13:17:14 | x2 |
-| variables.rs:20:15:20:16 | x2 | variables.rs:17:13:17:14 | x2 |
-| variables.rs:25:15:25:16 | x3 | variables.rs:24:9:24:10 | x3 |
-| variables.rs:27:9:27:10 | x3 | variables.rs:24:9:24:10 | x3 |
-| variables.rs:28:15:28:16 | x3 | variables.rs:26:9:26:10 | x3 |
-| variables.rs:33:15:33:16 | x4 | variables.rs:32:9:32:10 | x4 |
-| variables.rs:36:19:36:20 | x4 | variables.rs:35:13:35:14 | x4 |
-| variables.rs:38:15:38:16 | x4 | variables.rs:32:9:32:10 | x4 |
-| variables.rs:57:15:57:16 | a1 | variables.rs:49:13:49:14 | a1 |
-| variables.rs:58:15:58:16 | b1 | variables.rs:50:13:50:14 | b1 |
-| variables.rs:59:15:59:15 | x | variables.rs:53:13:53:13 | x |
-| variables.rs:60:15:60:15 | y | variables.rs:54:13:54:13 | y |
-| variables.rs:68:9:68:10 | p1 | variables.rs:64:9:64:10 | p1 |
-| variables.rs:69:15:69:16 | a2 | variables.rs:66:12:66:13 | a2 |
-| variables.rs:70:15:70:16 | b2 | variables.rs:67:12:67:13 | b2 |
-| variables.rs:77:11:77:12 | s1 | variables.rs:74:9:74:10 | s1 |
-| variables.rs:78:19:78:20 | s2 | variables.rs:76:21:76:22 | s2 |
-| variables.rs:87:15:87:16 | x5 | variables.rs:83:14:83:15 | x5 |
-| variables.rs:94:11:94:12 | s1 | variables.rs:91:9:91:10 | s1 |
-| variables.rs:95:19:95:20 | s2 | variables.rs:93:24:93:25 | s2 |
-| variables.rs:103:11:103:12 | x6 | variables.rs:100:9:100:10 | x6 |
-| variables.rs:108:23:108:24 | y1 | variables.rs:105:14:105:15 | y1 |
-| variables.rs:113:15:113:16 | y1 | variables.rs:101:9:101:10 | y1 |
-| variables.rs:119:11:119:17 | numbers | variables.rs:117:9:117:15 | numbers |
-| variables.rs:125:23:125:27 | first | variables.rs:121:13:121:17 | first |
-| variables.rs:126:23:126:27 | third | variables.rs:122:13:122:17 | third |
-| variables.rs:127:23:127:27 | fifth | variables.rs:123:13:123:17 | fifth |
-| variables.rs:131:11:131:17 | numbers | variables.rs:117:9:117:15 | numbers |
-| variables.rs:137:23:137:27 | first | variables.rs:133:13:133:17 | first |
-| variables.rs:138:23:138:26 | last | variables.rs:135:13:135:16 | last |
-| variables.rs:146:11:146:12 | p2 | variables.rs:144:9:144:10 | p2 |
-| variables.rs:149:24:149:25 | x7 | variables.rs:148:16:148:17 | x7 |
-| variables.rs:160:11:160:13 | msg | variables.rs:158:9:158:11 | msg |
-| variables.rs:163:24:163:34 | id_variable | variables.rs:162:17:162:27 | id_variable |
-| variables.rs:168:23:168:24 | id | variables.rs:167:26:167:27 | id |
-| variables.rs:179:11:179:16 | either | variables.rs:178:9:178:14 | either |
-| variables.rs:181:26:181:27 | a3 | variables.rs:180:9:180:44 | a3 |
-| variables.rs:193:11:193:12 | tv | variables.rs:192:9:192:10 | tv |
-| variables.rs:195:26:195:27 | a4 | variables.rs:194:9:194:81 | a4 |
-| variables.rs:197:11:197:12 | tv | variables.rs:192:9:192:10 | tv |
-| variables.rs:199:26:199:27 | a5 | variables.rs:198:9:198:83 | a5 |
-| variables.rs:201:11:201:12 | tv | variables.rs:192:9:192:10 | tv |
-| variables.rs:203:26:203:27 | a6 | variables.rs:202:9:202:83 | a6 |
-| variables.rs:209:11:209:16 | either | variables.rs:208:9:208:14 | either |
-| variables.rs:211:16:211:17 | a7 | variables.rs:210:9:210:44 | a7 |
-| variables.rs:212:26:212:27 | a7 | variables.rs:210:9:210:44 | a7 |
-| variables.rs:220:11:220:16 | either | variables.rs:218:9:218:14 | either |
-| variables.rs:224:23:224:25 | a11 | variables.rs:222:14:222:51 | a11 |
-| variables.rs:226:15:226:15 | e | variables.rs:221:13:221:13 | e |
-| variables.rs:227:28:227:30 | a12 | variables.rs:225:33:225:35 | a12 |
-| variables.rs:243:11:243:12 | fv | variables.rs:242:9:242:10 | fv |
-| variables.rs:245:26:245:28 | a13 | variables.rs:244:9:244:109 | a13 |
-| variables.rs:255:15:255:16 | a8 | variables.rs:250:5:250:6 | a8 |
-| variables.rs:256:15:256:16 | b3 | variables.rs:252:9:252:10 | b3 |
-| variables.rs:257:15:257:16 | c1 | variables.rs:253:9:253:10 | c1 |
-| variables.rs:263:15:263:16 | a9 | variables.rs:261:6:261:41 | a9 |
-| variables.rs:272:15:272:17 | a10 | variables.rs:268:13:268:15 | a10 |
-| variables.rs:273:15:273:16 | b4 | variables.rs:269:13:269:14 | b4 |
-| variables.rs:274:15:274:16 | c2 | variables.rs:270:13:270:14 | c2 |
-| variables.rs:281:9:281:11 | a10 | variables.rs:268:13:268:15 | a10 |
-| variables.rs:282:9:282:10 | b4 | variables.rs:269:13:269:14 | b4 |
-| variables.rs:283:9:283:10 | c2 | variables.rs:270:13:270:14 | c2 |
-| variables.rs:285:15:285:17 | a10 | variables.rs:268:13:268:15 | a10 |
-| variables.rs:286:15:286:16 | b4 | variables.rs:269:13:269:14 | b4 |
-| variables.rs:287:15:287:16 | c2 | variables.rs:270:13:270:14 | c2 |
-| variables.rs:294:23:294:25 | a10 | variables.rs:291:13:291:15 | a10 |
-| variables.rs:295:23:295:24 | b4 | variables.rs:292:13:292:14 | b4 |
-| variables.rs:299:15:299:17 | a10 | variables.rs:268:13:268:15 | a10 |
-| variables.rs:300:15:300:16 | b4 | variables.rs:269:13:269:14 | b4 |
-| variables.rs:306:9:306:9 | x | variables.rs:305:10:305:10 | x |
-| variables.rs:308:9:308:23 | example_closure | variables.rs:304:9:304:23 | example_closure |
-| variables.rs:309:15:309:16 | n1 | variables.rs:307:9:307:10 | n1 |
-| variables.rs:314:9:314:9 | x | variables.rs:313:10:313:10 | x |
-| variables.rs:316:9:316:26 | immutable_variable | variables.rs:312:9:312:26 | immutable_variable |
-| variables.rs:317:15:317:16 | n2 | variables.rs:315:9:315:10 | n2 |
-| variables.rs:324:12:324:12 | v | variables.rs:321:9:321:9 | v |
-| variables.rs:325:19:325:22 | text | variables.rs:323:9:323:12 | text |
-| variables.rs:332:15:332:15 | a | variables.rs:330:13:330:13 | a |
-| variables.rs:334:15:334:15 | a | variables.rs:330:13:330:13 | a |
-| variables.rs:341:6:341:10 | ref_i | variables.rs:339:9:339:13 | ref_i |
-| variables.rs:342:15:342:15 | i | variables.rs:338:13:338:13 | i |
-| variables.rs:346:6:346:6 | x | variables.rs:345:17:345:17 | x |
-| variables.rs:347:10:347:10 | x | variables.rs:345:17:345:17 | x |
-| variables.rs:348:10:348:10 | x | variables.rs:345:17:345:17 | x |
-| variables.rs:349:12:349:12 | x | variables.rs:345:17:345:17 | x |
-| variables.rs:353:6:353:6 | x | variables.rs:352:22:352:22 | x |
-| variables.rs:354:10:354:10 | x | variables.rs:352:22:352:22 | x |
-| variables.rs:355:10:355:10 | x | variables.rs:352:22:352:22 | x |
-| variables.rs:356:6:356:6 | y | variables.rs:352:39:352:39 | y |
-| variables.rs:357:9:357:9 | x | variables.rs:352:22:352:22 | x |
-| variables.rs:364:6:364:6 | y | variables.rs:362:9:362:9 | y |
-| variables.rs:366:15:366:15 | x | variables.rs:361:13:361:13 | x |
-| variables.rs:373:9:373:9 | w | variables.rs:369:9:369:9 | w |
-| variables.rs:375:7:375:7 | w | variables.rs:369:9:369:9 | w |
-| variables.rs:377:15:377:15 | z | variables.rs:368:13:368:13 | z |
-| variables.rs:384:6:384:6 | y | variables.rs:382:9:382:9 | y |
-| variables.rs:385:15:385:15 | x | variables.rs:381:13:381:13 | x |
-| variables.rs:391:19:391:19 | x | variables.rs:389:13:389:13 | x |
-| variables.rs:394:5:394:7 | cap | variables.rs:390:13:390:15 | cap |
-| variables.rs:395:15:395:15 | x | variables.rs:389:13:389:13 | x |
-| variables.rs:401:19:401:19 | x | variables.rs:399:9:399:9 | x |
-| variables.rs:403:5:403:7 | cap | variables.rs:400:13:400:15 | cap |
-| variables.rs:404:15:404:15 | x | variables.rs:399:9:399:9 | x |
-| variables.rs:409:15:409:15 | x | variables.rs:408:13:408:13 | x |
-| variables.rs:410:15:410:15 | x | variables.rs:408:13:408:13 | x |
-| variables.rs:411:8:411:8 | b | variables.rs:407:8:407:8 | b |
-| variables.rs:413:19:413:19 | x | variables.rs:408:13:408:13 | x |
-| variables.rs:414:19:414:19 | x | variables.rs:408:13:408:13 | x |
-| variables.rs:417:19:417:19 | x | variables.rs:408:13:408:13 | x |
-| variables.rs:418:19:418:19 | x | variables.rs:408:13:408:13 | x |
-| variables.rs:420:15:420:15 | x | variables.rs:408:13:408:13 | x |
-| variables.rs:425:8:425:9 | b1 | variables.rs:423:13:423:14 | b1 |
-| variables.rs:426:19:426:19 | x | variables.rs:424:9:424:9 | x |
-| variables.rs:428:19:428:19 | x | variables.rs:424:9:424:9 | x |
-| variables.rs:431:8:431:9 | b2 | variables.rs:423:24:423:25 | b2 |
-| variables.rs:432:19:432:19 | x | variables.rs:424:9:424:9 | x |
-| variables.rs:434:19:434:19 | x | variables.rs:424:9:424:9 | x |
-| variables.rs:451:15:451:15 | a | variables.rs:450:13:450:13 | a |
-| variables.rs:452:5:452:5 | a | variables.rs:450:13:450:13 | a |
-| variables.rs:453:15:453:15 | a | variables.rs:450:13:450:13 | a |
-| variables.rs:455:15:455:15 | a | variables.rs:450:13:450:13 | a |
-| variables.rs:459:16:459:16 | x | variables.rs:458:14:458:14 | x |
-| variables.rs:465:15:465:15 | x | variables.rs:463:9:463:9 | x |
-| variables.rs:483:3:483:3 | a | variables.rs:482:11:482:11 | a |
-| variables.rs:485:13:485:13 | a | variables.rs:482:11:482:11 | a |
+| 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:437:15:437:15 | x | variables.rs:436:13:436:13 | x |
+| variables.rs:438:15:438:15 | x | variables.rs:436:13:436:13 | x |
+| variables.rs:439:8:439:8 | b | variables.rs:435:8:435:8 | b |
+| variables.rs:441:19:441:19 | x | variables.rs:436:13:436:13 | x |
+| variables.rs:442:19:442:19 | x | variables.rs:436:13:436:13 | x |
+| variables.rs:445:19:445:19 | x | variables.rs:436:13:436:13 | x |
+| variables.rs:446:19:446:19 | x | variables.rs:436:13:436:13 | x |
+| variables.rs:448:15:448:15 | x | variables.rs:436:13:436:13 | x |
+| variables.rs:453:8:453:9 | b1 | variables.rs:451:13:451:14 | b1 |
+| variables.rs:454:19:454:19 | x | variables.rs:452:9:452:9 | x |
+| variables.rs:456:19:456:19 | x | variables.rs:452:9:452:9 | x |
+| variables.rs:459:8:459:9 | b2 | variables.rs:451:24:451:25 | b2 |
+| variables.rs:460:19:460:19 | x | variables.rs:452:9:452:9 | x |
+| variables.rs:462:19:462:19 | x | variables.rs:452:9:452:9 | x |
+| variables.rs:479:15:479:15 | a | variables.rs:478:13:478:13 | a |
+| variables.rs:480:5:480:5 | a | variables.rs:478:13:478:13 | a |
+| variables.rs:481:15:481:15 | a | variables.rs:478:13:478:13 | a |
+| variables.rs:483:15:483:15 | a | variables.rs:478:13:478:13 | a |
+| variables.rs:489:15:489:15 | x | variables.rs:487:9:487:9 | x |
+| variables.rs:507:3:507:3 | a | variables.rs:506:11:506:11 | a |
+| variables.rs:509:13:509:13 | a | variables.rs:506:11:506:11 | a |
 variableInitializer
-| variables.rs:12:9:12:10 | x1 | variables.rs:12:14:12:16 | "a" |
-| variables.rs:17:13:17:14 | x2 | variables.rs:17:18:17:18 | 4 |
-| variables.rs:24:9:24:10 | x3 | variables.rs:24:14:24:14 | 1 |
-| variables.rs:26:9:26:10 | x3 | variables.rs:27:9:27:14 | ... + ... |
-| variables.rs:32:9:32:10 | x4 | variables.rs:32:14:32:16 | "a" |
-| variables.rs:35:13:35:14 | x4 | variables.rs:35:18:35:20 | "b" |
-| variables.rs:64:9:64:10 | p1 | variables.rs:64:14:64:37 | RecordExpr |
-| variables.rs:74:9:74:10 | s1 | variables.rs:74:14:74:41 | CallExpr |
-| variables.rs:91:9:91:10 | s1 | variables.rs:91:14:91:41 | CallExpr |
-| variables.rs:100:9:100:10 | x6 | variables.rs:100:14:100:20 | CallExpr |
-| variables.rs:101:9:101:10 | y1 | variables.rs:101:14:101:15 | 10 |
-| variables.rs:117:9:117:15 | numbers | variables.rs:117:19:117:35 | TupleExpr |
-| variables.rs:144:9:144:10 | p2 | variables.rs:144:14:144:37 | RecordExpr |
-| variables.rs:158:9:158:11 | msg | variables.rs:158:15:158:38 | RecordExpr |
-| variables.rs:178:9:178:14 | either | variables.rs:178:18:178:33 | CallExpr |
-| variables.rs:192:9:192:10 | tv | variables.rs:192:14:192:36 | CallExpr |
-| variables.rs:208:9:208:14 | either | variables.rs:208:18:208:33 | CallExpr |
-| variables.rs:218:9:218:14 | either | variables.rs:218:18:218:33 | CallExpr |
-| variables.rs:242:9:242:10 | fv | variables.rs:242:14:242:35 | CallExpr |
-| variables.rs:304:9:304:23 | example_closure | variables.rs:305:9:306:9 | ClosureExpr |
-| variables.rs:307:9:307:10 | n1 | variables.rs:308:9:308:26 | CallExpr |
-| variables.rs:312:9:312:26 | immutable_variable | variables.rs:313:9:314:9 | ClosureExpr |
-| variables.rs:315:9:315:10 | n2 | variables.rs:316:9:316:29 | CallExpr |
-| variables.rs:321:9:321:9 | v | variables.rs:321:13:321:41 | RefExpr |
-| variables.rs:330:13:330:13 | a | variables.rs:330:17:330:17 | 0 |
-| variables.rs:338:13:338:13 | i | variables.rs:338:17:338:17 | 1 |
-| variables.rs:339:9:339:13 | ref_i | variables.rs:340:9:340:14 | RefExpr |
-| variables.rs:361:13:361:13 | x | variables.rs:361:17:361:17 | 2 |
-| variables.rs:362:9:362:9 | y | variables.rs:363:9:363:28 | CallExpr |
-| variables.rs:368:13:368:13 | z | variables.rs:368:17:368:17 | 4 |
-| variables.rs:369:9:369:9 | w | variables.rs:370:9:370:19 | RefExpr |
-| variables.rs:381:13:381:13 | x | variables.rs:381:17:381:17 | 1 |
-| variables.rs:382:9:382:9 | y | variables.rs:383:9:383:14 | RefExpr |
-| variables.rs:389:13:389:13 | x | variables.rs:389:17:389:18 | 10 |
-| variables.rs:390:13:390:15 | cap | variables.rs:390:19:393:5 | ClosureExpr |
-| variables.rs:399:9:399:9 | x | variables.rs:399:13:399:15 | 100 |
-| variables.rs:400:13:400:15 | cap | variables.rs:400:19:402:5 | ClosureExpr |
-| variables.rs:408:13:408:13 | x | variables.rs:408:17:408:17 | 1 |
-| variables.rs:424:9:424:9 | x | variables.rs:424:13:424:13 | 1 |
-| variables.rs:450:13:450:13 | a | variables.rs:450:17:450:35 | RecordExpr |
-| variables.rs:463:9:463:9 | x | variables.rs:463:13:463:14 | 16 |
-| variables.rs:467:9:467:9 | z | variables.rs:467:13:467:14 | 17 |
-| variables.rs:482:11:482:11 | a | variables.rs:482:15:482:33 | RecordExpr |
+| 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 | x | variables.rs:436:17:436:17 | 1 |
+| variables.rs:452:9:452:9 | x | variables.rs:452:13:452:13 | 1 |
+| variables.rs:478:13:478:13 | a | variables.rs:478:17:478:35 | RecordExpr |
+| variables.rs:487:9:487:9 | x | variables.rs:487:13:487:14 | 16 |
+| variables.rs:491:9:491:9 | z | variables.rs:491:13:491:14 | 17 |
+| variables.rs:506:11:506:11 | a | variables.rs:506:15:506:33 | RecordExpr |
 capturedVariable
-| variables.rs:389:13:389:13 | x |
-| variables.rs:399:9:399:9 | x |
+| 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 |
 capturedAccess
-| variables.rs:391:19:391:19 | x |
-| variables.rs:392:9:392:9 | x |
-| variables.rs:401:19:401:19 | x |
+| 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 |
diff --git a/rust/ql/test/library-tests/variables/variables.rs b/rust/ql/test/library-tests/variables/variables.rs
index a94d83c87b2..c561daf2062 100644
--- a/rust/ql/test/library-tests/variables/variables.rs
+++ b/rust/ql/test/library-tests/variables/variables.rs
@@ -8,6 +8,10 @@ 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
@@ -20,6 +24,13 @@ fn mutable_variable() {
     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
@@ -385,23 +396,40 @@ fn alias() {
     print_i64(x); // $ read_access=x
 }
 
-fn capture_mut() {
-    let mut x = 10; // x
-    let mut cap = || {
+fn capture_immut() {
+    let x = 100; // x
+    // Captures immutable value by immutable reference
+    let cap = || {
         print_i64(x); // $ read_access=x
-        x += 1; // $ access=x
     };
     cap(); // $ read_access=cap
     print_i64(x); // $ read_access=x
 }
 
-fn capture_immut() {
-    let x = 100; // x
-    let mut cap = || {
+fn capture_mut() {
+    let mut x = 1; // x
+    // Captures mutable value by immutable reference
+    let closure1 = || {
         print_i64(x); // $ read_access=x
     };
-    cap(); // $ read_access=cap
+    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
 }
 
 fn phi(b : bool) {
@@ -455,17 +483,13 @@ fn structs() {
     print_i64(a.my_get()); // $ read_access=a
 }
 
-fn ref_param(x: &i64) {
-    print_i64(*x) // $ read_access=x
-}
-
 fn ref_arg() {
     let x = 16; // x
-    ref_param(&x); // $ access=x
+    print_i64_ref(&x); // $ access=x
     print_i64(x); // $ read_access=x
 
     let z = 17; // z
-    ref_param(&z); // $ access=z
+    print_i64_ref(&z); // $ access=z
 }
 
 trait Bar {
@@ -488,6 +512,7 @@ fn ref_methodcall_receiver() {
 fn main() {
     immutable_variable();
     mutable_variable();
+    mutable_variable_immutable_borrow();
     variable_shadow1();
     variable_shadow2();
     let_pattern1();
diff --git a/rust/ql/test/options b/rust/ql/test/options
new file mode 100644
index 00000000000..c7a0beabb53
--- /dev/null
+++ b/rust/ql/test/options
@@ -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/DataFlowConsistency.expected b/rust/ql/test/query-tests/diagnostics/CONSISTENCY/DataFlowConsistency.expected
new file mode 100644
index 00000000000..b367ef95ef5
--- /dev/null
+++ b/rust/ql/test/query-tests/diagnostics/CONSISTENCY/DataFlowConsistency.expected
@@ -0,0 +1,8 @@
+uniqueCallEnclosingCallable
+| comments.rs:55:5:55:20 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:13:14:13:28 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:15:5:15:24 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:16:5:16:23 | CallExpr | Call should have one enclosing callable but has 0. |
+| my_macro.rs:16:9:16:18 | CallExpr | Call should have one enclosing callable but has 0. |
+| my_struct.rs:17:18:17:32 | CallExpr | Call should have one enclosing callable but has 0. |
+| my_struct.rs:25:19:25:37 | CallExpr | Call should have one enclosing callable but has 0. |
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/SummaryStats.expected b/rust/ql/test/query-tests/diagnostics/SummaryStats.expected
index 100ade0c020..56fda0b4f8e 100644
--- a/rust/ql/test/query-tests/diagnostics/SummaryStats.expected
+++ b/rust/ql/test/query-tests/diagnostics/SummaryStats.expected
@@ -5,5 +5,7 @@
 | Files extracted - total | 7 |
 | Files extracted - with errors | 2 |
 | Files extracted - without errors | 5 |
+| Inconsistencies - AST | 0 |
+| Inconsistencies - CFG | 0 |
 | Lines of code extracted | 59 |
 | Lines of user code extracted | 59 |
diff --git a/rust/ql/test/query-tests/diagnostics/options b/rust/ql/test/query-tests/diagnostics/options
new file mode 100644
index 00000000000..cf148dd35f8
--- /dev/null
+++ b/rust/ql/test/query-tests/diagnostics/options
@@ -0,0 +1 @@
+qltest_cargo_check: false
diff --git a/rust/ql/test/query-tests/unusedentities/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/query-tests/unusedentities/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index bdd995b19f3..00000000000
--- a/rust/ql/test/query-tests/unusedentities/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,11 +0,0 @@
-multipleSuccessors
-| main.rs:428:17:428:17 | 0 | successor | main.rs:428:9:428:10 | a2 |
-| main.rs:428:17:428:17 | 0 | successor | main.rs:428:20:428:62 | ClosureExpr |
-| main.rs:431:17:431:17 | 0 | successor | main.rs:431:9:431:10 | a3 |
-| main.rs:431:17:431:17 | 0 | successor | main.rs:431:20:431:41 | ClosureExpr |
-| main.rs:434:17:434:17 | 0 | successor | main.rs:434:9:434:10 | a4 |
-| main.rs:434:17:434:17 | 0 | successor | main.rs:434:20:434:35 | ClosureExpr |
-| main.rs:437:17:437:17 | 0 | successor | main.rs:437:9:437:10 | a5 |
-| main.rs:437:17:437:17 | 0 | successor | main.rs:437:20:437:35 | ClosureExpr |
-| main.rs:441:17:441:17 | 0 | successor | main.rs:441:9:441:10 | a6 |
-| main.rs:441:17:441:17 | 0 | successor | main.rs:441:20:441:46 | ClosureExpr |
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..300f3fc863a
--- /dev/null
+++ b/rust/ql/test/query-tests/unusedentities/CONSISTENCY/DataFlowConsistency.expected
@@ -0,0 +1,240 @@
+uniqueEnclosingCallable
+| main.rs:140:5:140:10 | Param | Node should have one enclosing callable but has 0. |
+| main.rs:141:5:141:10 | Param | Node should have one enclosing callable but has 0. |
+| main.rs:142:5:142:11 | Param | Node should have one enclosing callable but has 0. |
+| main.rs:149:7:149:12 | Param | Node should have one enclosing callable but has 0. |
+| main.rs:382:19:382:21 | Param | Node should have one enclosing callable but has 0. |
+| main.rs:384:14:384:19 | Param | Node should have one enclosing callable but has 0. |
+| main.rs:411:21:411:28 | Param | Node should have one enclosing callable but has 0. |
+| main.rs:411:31:411:38 | Param | Node should have one enclosing callable but has 0. |
+| main.rs:414:21:414:23 | Param | Node should have one enclosing callable but has 0. |
+| main.rs:414:26:414:28 | Param | Node should have one enclosing callable but has 0. |
+| main.rs:417:21:417:23 | Param | Node should have one enclosing callable but has 0. |
+| main.rs:417:26:417:28 | Param | Node should have one enclosing callable but has 0. |
+| main.rs:420:21:420:23 | Param | Node should have one enclosing callable but has 0. |
+| main.rs:420:26:420:28 | Param | Node should have one enclosing callable but has 0. |
+| main.rs:424:21:424:23 | Param | Node should have one enclosing callable but has 0. |
+| main.rs:424:26:424:28 | Param | Node should have one enclosing callable but has 0. |
+| main.rs:430:29:430:38 | Param | Node should have one enclosing callable but has 0. |
+| main.rs:430:41:430:56 | Param | Node should have one enclosing callable but has 0. |
+| main.rs:440:9:440:18 | Param | Node should have one enclosing callable but has 0. |
+| main.rs:441:9:441:24 | Param | Node should have one enclosing callable but has 0. |
+| more.rs:4:23:4:28 | Param | Node should have one enclosing callable but has 0. |
+| more.rs:8:19:8:24 | Param | Node should have one enclosing callable but has 0. |
+| more.rs:16:23:16:28 | Param | Node should have one enclosing callable but has 0. |
+| more.rs:24:9:24:14 | Param | Node should have one enclosing callable but has 0. |
+| unreachable.rs:10:34:10:34 | Param | Node should have one enclosing callable but has 0. |
+uniqueCallEnclosingCallable
+| main.rs:11:13:11:29 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:12:13:12:29 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:16:14:16:24 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:18:8:18:13 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:19:18:19:28 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:22:14:22:24 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:23:5:23:19 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:23:5:23:19 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:41:14:41:24 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:45:8:45:13 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:50:14:50:24 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:53:8:53:13 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:58:14:58:24 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:62:14:62:24 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:67:12:67:17 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:68:12:68:17 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:69:12:69:17 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:70:14:70:24 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:96:14:96:45 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:99:14:99:38 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:101:14:101:38 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:114:14:114:32 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:117:18:117:33 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:174:18:174:29 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:178:18:178:31 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:182:18:182:37 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:187:22:187:33 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:192:18:192:27 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:196:21:196:30 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:196:21:196:30 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:200:18:200:38 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:204:9:204:24 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:204:9:204:24 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:208:9:208:24 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:213:9:213:32 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:213:20:213:24 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:213:27:213:31 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:240:22:240:29 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:243:22:243:29 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:247:20:247:27 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:254:21:254:28 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:260:13:260:20 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:267:13:267:20 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:275:13:275:28 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:282:13:282:30 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:289:31:289:37 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:337:21:337:51 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:338:5:338:39 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:340:58:340:92 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:340:61:340:91 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:343:22:343:59 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:346:22:346:29 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:396:13:396:24 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:400:13:400:22 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:460:9:464:10 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:471:5:471:14 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:472:5:472:14 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:473:5:473:13 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:474:5:474:12 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:475:5:475:13 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:476:14:476:54 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:476:36:476:54 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:477:5:477:11 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:478:5:478:21 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:479:5:479:15 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:480:5:480:15 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:481:5:481:24 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:483:5:483:22 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:485:5:485:23 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:487:5:487:23 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:488:5:488:23 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:489:5:489:23 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:490:5:490:22 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:491:5:491:22 | CallExpr | Call should have one enclosing callable but has 0. |
+| main.rs:493:5:493:12 | CallExpr | Call should have one enclosing callable but has 0. |
+| more.rs:45:14:45:26 | CallExpr | Call should have one enclosing callable but has 0. |
+| more.rs:46:14:46:25 | CallExpr | Call should have one enclosing callable but has 0. |
+| more.rs:47:14:47:26 | CallExpr | Call should have one enclosing callable but has 0. |
+| more.rs:51:14:51:24 | CallExpr | Call should have one enclosing callable but has 0. |
+| more.rs:56:14:56:30 | CallExpr | Call should have one enclosing callable but has 0. |
+| more.rs:61:14:61:30 | CallExpr | Call should have one enclosing callable but has 0. |
+| more.rs:67:14:67:25 | CallExpr | Call should have one enclosing callable but has 0. |
+| more.rs:76:14:76:20 | CallExpr | Call should have one enclosing callable but has 0. |
+| more.rs:82:14:82:26 | CallExpr | Call should have one enclosing callable but has 0. |
+| unreachable.rs:2:5:2:18 | CallExpr | Call should have one enclosing callable but has 0. |
+| unreachable.rs:6:5:6:24 | CallExpr | Call should have one enclosing callable but has 0. |
+| unreachable.rs:10:5:10:20 | CallExpr | Call should have one enclosing callable but has 0. |
+| unreachable.rs:19:9:19:22 | CallExpr | Call should have one enclosing callable but has 0. |
+| unreachable.rs:21:9:21:22 | CallExpr | Call should have one enclosing callable but has 0. |
+| unreachable.rs:25:9:25:22 | CallExpr | Call should have one enclosing callable but has 0. |
+| unreachable.rs:27:9:27:22 | CallExpr | Call should have one enclosing callable but has 0. |
+| unreachable.rs:30:13:30:26 | CallExpr | Call should have one enclosing callable but has 0. |
+| unreachable.rs:33:13:33:26 | CallExpr | Call should have one enclosing callable but has 0. |
+| unreachable.rs:37:8:37:13 | CallExpr | Call should have one enclosing callable but has 0. |
+| unreachable.rs:39:9:39:22 | CallExpr | Call should have one enclosing callable but has 0. |
+| unreachable.rs:42:8:42:13 | CallExpr | Call should have one enclosing callable but has 0. |
+| unreachable.rs:43:9:43:22 | CallExpr | Call should have one enclosing callable but has 0. |
+| unreachable.rs:46:9:46:22 | CallExpr | Call should have one enclosing callable but has 0. |
+| unreachable.rs:48:5:48:18 | CallExpr | Call should have one enclosing callable but has 0. |
+| unreachable.rs:50:8:50:13 | CallExpr | Call should have one enclosing callable but has 0. |
+| unreachable.rs:51:17:51:22 | CallExpr | Call should have one enclosing callable but has 0. |
+| unreachable.rs:54:13:54:26 | CallExpr | Call should have one enclosing callable but has 0. |
+| unreachable.rs:56:17:56:30 | CallExpr | Call should have one enclosing callable but has 0. |
+| unreachable.rs:58:13:58:26 | CallExpr | Call should have one enclosing callable but has 0. |
+| unreachable.rs:62:8:62:13 | CallExpr | Call should have one enclosing callable but has 0. |
+| unreachable.rs:67:5:67:18 | CallExpr | Call should have one enclosing callable but has 0. |
+| unreachable.rs:71:8:71:13 | CallExpr | Call should have one enclosing callable but has 0. |
+| unreachable.rs:72:9:72:22 | CallExpr | Call should have one enclosing callable but has 0. |
+| unreachable.rs:73:16:73:25 | CallExpr | Call should have one enclosing callable but has 0. |
+| unreachable.rs:74:9:74:22 | CallExpr | Call should have one enclosing callable but has 0. |
+| unreachable.rs:77:8:77:13 | CallExpr | Call should have one enclosing callable but has 0. |
+| unreachable.rs:78:9:78:22 | CallExpr | Call should have one enclosing callable but has 0. |
+| unreachable.rs:79:9:79:24 | CallExpr | Call should have one enclosing callable but has 0. |
+| unreachable.rs:80:9:80:22 | CallExpr | Call should have one enclosing callable but has 0. |
+| unreachable.rs:83:8:83:13 | CallExpr | Call should have one enclosing callable but has 0. |
+| unreachable.rs:84:9:84:22 | CallExpr | Call should have one enclosing callable but has 0. |
+| unreachable.rs:85:9:85:15 | CallExpr | Call should have one enclosing callable but has 0. |
+| unreachable.rs:86:9:86:22 | CallExpr | Call should have one enclosing callable but has 0. |
+| unreachable.rs:89:8:89:13 | CallExpr | Call should have one enclosing callable but has 0. |
+| unreachable.rs:90:9:90:22 | CallExpr | Call should have one enclosing callable but has 0. |
+| unreachable.rs:91:9:91:22 | CallExpr | Call should have one enclosing callable but has 0. |
+| unreachable.rs:92:9:92:22 | CallExpr | Call should have one enclosing callable but has 0. |
+| unreachable.rs:95:8:95:13 | CallExpr | Call should have one enclosing callable but has 0. |
+| unreachable.rs:98:17:98:29 | CallExpr | Call should have one enclosing callable but has 0. |
+| unreachable.rs:100:9:100:22 | CallExpr | Call should have one enclosing callable but has 0. |
+| unreachable.rs:102:20:102:25 | CallExpr | Call should have one enclosing callable but has 0. |
+| unreachable.rs:102:29:102:41 | CallExpr | Call should have one enclosing callable but has 0. |
+| unreachable.rs:104:9:104:22 | CallExpr | Call should have one enclosing callable but has 0. |
+| unreachable.rs:108:9:108:22 | CallExpr | Call should have one enclosing callable but has 0. |
+| unreachable.rs:111:8:111:13 | CallExpr | Call should have one enclosing callable but has 0. |
+| unreachable.rs:112:9:112:22 | CallExpr | Call should have one enclosing callable but has 0. |
+| unreachable.rs:114:13:114:20 | CallExpr | Call should have one enclosing callable but has 0. |
+| unreachable.rs:114:13:114:20 | CallExpr | Call should have one enclosing callable but has 0. |
+| unreachable.rs:115:9:115:22 | CallExpr | Call should have one enclosing callable but has 0. |
+| unreachable.rs:116:22:116:29 | CallExpr | Call should have one enclosing callable but has 0. |
+| unreachable.rs:116:22:116:29 | CallExpr | Call should have one enclosing callable but has 0. |
+| unreachable.rs:117:9:117:22 | CallExpr | Call should have one enclosing callable but has 0. |
+| unreachable.rs:120:8:120:13 | CallExpr | Call should have one enclosing callable but has 0. |
+| unreachable.rs:121:9:121:22 | CallExpr | Call should have one enclosing callable but has 0. |
+| unreachable.rs:123:13:123:20 | CallExpr | Call should have one enclosing callable but has 0. |
+| unreachable.rs:123:13:123:20 | CallExpr | Call should have one enclosing callable but has 0. |
+| unreachable.rs:124:9:124:22 | CallExpr | Call should have one enclosing callable but has 0. |
+| unreachable.rs:125:21:125:28 | CallExpr | Call should have one enclosing callable but has 0. |
+| unreachable.rs:125:21:125:28 | CallExpr | Call should have one enclosing callable but has 0. |
+| unreachable.rs:126:9:126:22 | CallExpr | Call should have one enclosing callable but has 0. |
+| unreachable.rs:131:11:131:24 | CallExpr | Call should have one enclosing callable but has 0. |
+| unreachable.rs:136:13:136:26 | CallExpr | Call should have one enclosing callable but has 0. |
+| unreachable.rs:139:5:139:18 | CallExpr | Call should have one enclosing callable but has 0. |
+| unreachable.rs:141:11:141:24 | CallExpr | Call should have one enclosing callable but has 0. |
+| unreachable.rs:149:5:149:18 | CallExpr | Call should have one enclosing callable but has 0. |
+| unreachable.rs:154:9:154:22 | CallExpr | Call should have one enclosing callable but has 0. |
+| unreachable.rs:156:9:156:22 | CallExpr | Call should have one enclosing callable but has 0. |
+| unreachable.rs:159:8:159:13 | CallExpr | Call should have one enclosing callable but has 0. |
+| unreachable.rs:160:15:160:20 | CallExpr | Call should have one enclosing callable but has 0. |
+| unreachable.rs:161:13:161:26 | CallExpr | Call should have one enclosing callable but has 0. |
+| unreachable.rs:165:13:165:26 | CallExpr | Call should have one enclosing callable but has 0. |
+| unreachable.rs:169:13:169:26 | CallExpr | Call should have one enclosing callable but has 0. |
+| unreachable.rs:171:9:171:22 | CallExpr | Call should have one enclosing callable but has 0. |
+| unreachable.rs:175:12:175:17 | CallExpr | Call should have one enclosing callable but has 0. |
+| unreachable.rs:177:13:177:26 | CallExpr | Call should have one enclosing callable but has 0. |
+| unreachable.rs:179:9:179:22 | CallExpr | Call should have one enclosing callable but has 0. |
+| unreachable.rs:183:12:183:17 | CallExpr | Call should have one enclosing callable but has 0. |
+| unreachable.rs:185:13:185:26 | CallExpr | Call should have one enclosing callable but has 0. |
+| unreachable.rs:188:5:188:18 | CallExpr | Call should have one enclosing callable but has 0. |
+| unreachable.rs:189:5:189:18 | CallExpr | Call should have one enclosing callable but has 0. |
+| unreachable.rs:190:5:190:18 | CallExpr | Call should have one enclosing callable but has 0. |
+| unreachable.rs:198:22:198:41 | CallExpr | Call should have one enclosing callable but has 0. |
+| unreachable.rs:199:9:199:22 | CallExpr | Call should have one enclosing callable but has 0. |
+| unreachable.rs:202:9:202:22 | CallExpr | Call should have one enclosing callable but has 0. |
+| unreachable.rs:205:5:205:18 | CallExpr | Call should have one enclosing callable but has 0. |
+| unreachable.rs:207:16:207:29 | CallExpr | Call should have one enclosing callable but has 0. |
+| unreachable.rs:209:9:209:22 | CallExpr | Call should have one enclosing callable but has 0. |
+| unreachable.rs:212:9:212:22 | CallExpr | Call should have one enclosing callable but has 0. |
+| unreachable.rs:215:5:215:18 | CallExpr | Call should have one enclosing callable but has 0. |
+| unreachable.rs:219:19:219:38 | CallExpr | Call should have one enclosing callable but has 0. |
+| unreachable.rs:220:9:220:22 | CallExpr | Call should have one enclosing callable but has 0. |
+| unreachable.rs:224:5:224:18 | CallExpr | Call should have one enclosing callable but has 0. |
+| unreachable.rs:226:13:226:32 | CallExpr | Call should have one enclosing callable but has 0. |
+| unreachable.rs:228:9:228:22 | CallExpr | Call should have one enclosing callable but has 0. |
+| unreachable.rs:232:5:232:18 | CallExpr | Call should have one enclosing callable but has 0. |
+| unreachable.rs:236:8:236:13 | CallExpr | Call should have one enclosing callable but has 0. |
+| unreachable.rs:237:9:237:22 | CallExpr | Call should have one enclosing callable but has 0. |
+| unreachable.rs:240:9:240:22 | CallExpr | Call should have one enclosing callable but has 0. |
+| unreachable.rs:243:5:243:18 | CallExpr | Call should have one enclosing callable but has 0. |
+| unreachable.rs:247:9:247:14 | CallExpr | Call should have one enclosing callable but has 0. |
+| unreachable.rs:248:9:248:22 | CallExpr | Call should have one enclosing callable but has 0. |
+| unreachable.rs:252:5:252:18 | CallExpr | Call should have one enclosing callable but has 0. |
+uniqueType
+| main.rs:140:5:140:10 | Param | Node should have one type but has 0. |
+| main.rs:141:5:141:10 | Param | Node should have one type but has 0. |
+| main.rs:142:5:142:11 | Param | Node should have one type but has 0. |
+| main.rs:149:7:149:12 | Param | Node should have one type but has 0. |
+| main.rs:382:19:382:21 | Param | Node should have one type but has 0. |
+| main.rs:384:14:384:19 | Param | Node should have one type but has 0. |
+| main.rs:411:21:411:28 | Param | Node should have one type but has 0. |
+| main.rs:411:31:411:38 | Param | Node should have one type but has 0. |
+| main.rs:414:21:414:23 | Param | Node should have one type but has 0. |
+| main.rs:414:26:414:28 | Param | Node should have one type but has 0. |
+| main.rs:417:21:417:23 | Param | Node should have one type but has 0. |
+| main.rs:417:26:417:28 | Param | Node should have one type but has 0. |
+| main.rs:420:21:420:23 | Param | Node should have one type but has 0. |
+| main.rs:420:26:420:28 | Param | Node should have one type but has 0. |
+| main.rs:424:21:424:23 | Param | Node should have one type but has 0. |
+| main.rs:424:26:424:28 | Param | Node should have one type but has 0. |
+| main.rs:430:29:430:38 | Param | Node should have one type but has 0. |
+| main.rs:430:41:430:56 | Param | Node should have one type but has 0. |
+| main.rs:440:9:440:18 | Param | Node should have one type but has 0. |
+| main.rs:441:9:441:24 | Param | Node should have one type but has 0. |
+| more.rs:4:23:4:28 | Param | Node should have one type but has 0. |
+| more.rs:8:19:8:24 | Param | Node should have one type but has 0. |
+| more.rs:16:23:16:28 | Param | Node should have one type but has 0. |
+| more.rs:24:9:24:14 | Param | Node should have one type but has 0. |
+| unreachable.rs:10:34:10:34 | Param | Node should have one type but has 0. |
diff --git a/rust/ql/test/query-tests/unusedentities/UnreachableCode.expected b/rust/ql/test/query-tests/unusedentities/UnreachableCode.expected
index fa463c47fc3..5d7a6004223 100644
--- a/rust/ql/test/query-tests/unusedentities/UnreachableCode.expected
+++ b/rust/ql/test/query-tests/unusedentities/UnreachableCode.expected
@@ -1,14 +1,16 @@
-| unreachable.rs:12:3:12:17 | ExprStmt | This code is never reached. |
-| unreachable.rs:20:3:20:17 | ExprStmt | This code is never reached. |
-| unreachable.rs:32:3:32:17 | ExprStmt | This code is never reached. |
-| unreachable.rs:39:3:39:17 | ExprStmt | This code is never reached. |
-| unreachable.rs:60:2:60:16 | ExprStmt | This code is never reached. |
-| unreachable.rs:106:16:106:23 | ExprStmt | This code is never reached. |
-| unreachable.rs:114:15:114:22 | ExprStmt | This code is never reached. |
-| unreachable.rs:130:2:130:16 | ExprStmt | This code is never reached. |
-| unreachable.rs:140:2:140:16 | ExprStmt | This code is never reached. |
-| unreachable.rs:147:3:147:17 | ExprStmt | This code is never reached. |
-| unreachable.rs:156:4:156:18 | ExprStmt | This code is never reached. |
-| unreachable.rs:162:3:162:17 | ExprStmt | This code is never reached. |
-| unreachable.rs:168:4:168:18 | ExprStmt | This code is never reached. |
-| unreachable.rs:171:2:171:16 | ExprStmt | This code is never reached. |
+| 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:114:13:114:20 | MacroExpr | This code is never reached. |
+| unreachable.rs:123:13:123:20 | MacroExpr | This code is never reached. |
+| unreachable.rs:149:5:149:19 | ExprStmt | This code is never reached. |
+| unreachable.rs:156:9:156:23 | ExprStmt | This code is never reached. |
+| unreachable.rs:165:13:165:27 | ExprStmt | This code is never reached. |
+| unreachable.rs:171:9:171:23 | ExprStmt | This code is never reached. |
+| unreachable.rs:177:13:177:27 | ExprStmt | This code is never reached. |
+| unreachable.rs:185:13:185:27 | ExprStmt | This code is never reached. |
+| unreachable.rs:188:5:188:19 | ExprStmt | This code is never reached. |
+| unreachable.rs:212:9:212:23 | ExprStmt | This code is never reached. |
+| unreachable.rs:228:9:228:23 | 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
index f65928931a1..23ca9359181 100644
--- a/rust/ql/test/query-tests/unusedentities/UnreachableCode.qlref
+++ b/rust/ql/test/query-tests/unusedentities/UnreachableCode.qlref
@@ -1 +1,2 @@
-queries/unusedentities/UnreachableCode.ql
\ No newline at end of file
+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
index e69de29bb2d..5b438d4c0de 100644
--- a/rust/ql/test/query-tests/unusedentities/UnusedValue.expected
+++ b/rust/ql/test/query-tests/unusedentities/UnusedValue.expected
@@ -0,0 +1,20 @@
+| main.rs:8:9:8:9 | a | Variable $@ is assigned a value that is never used. | main.rs:8:9:8:9 | a | a |
+| main.rs:11:9:11:9 | d | Variable $@ is assigned a value that is never used. | main.rs:11:9:11:9 | d | d |
+| main.rs:37:5:37:5 | b | Variable $@ is assigned a value that is never used. | main.rs:28:9:28:9 | b | b |
+| main.rs:39:5:39:5 | c | Variable $@ is assigned a value that is never used. | main.rs:29:13:29:13 | c | c |
+| main.rs:42:5:42:5 | c | Variable $@ is assigned a value that is never used. | main.rs:29:13:29:13 | c | c |
+| main.rs:46:9:46:9 | d | Variable $@ is assigned a value that is never used. | main.rs:30:13:30:13 | d | d |
+| main.rs:52:5:52:5 | e | Variable $@ is assigned a value that is never used. | main.rs:31:13:31:13 | e | e |
+| main.rs:63:5:63:5 | f | Variable $@ is assigned a value that is never used. | main.rs:32:13:32:13 | f | f |
+| main.rs:65:5:65:5 | f | Variable $@ is assigned a value that is never used. | main.rs:32:13:32:13 | f | f |
+| main.rs:67:5:67:5 | g | Variable $@ is assigned a value that is never used. | main.rs:33:9:33:9 | g | g |
+| main.rs:89:9:89:9 | a | Variable $@ is assigned a value that is never used. | main.rs:89:9:89:9 | a | a |
+| main.rs:110:9:110:10 | is | Variable $@ is assigned a value that is never used. | main.rs:110:9:110:10 | is | is |
+| main.rs:133:13:133:17 | total | Variable $@ is assigned a value that is never used. | main.rs:133:13:133:17 | total | total |
+| main.rs:270:13:270:17 | total | Variable $@ is assigned a value that is never used. | main.rs:238:13:238:17 | total | total |
+| main.rs:363:9:363:9 | x | Variable $@ is assigned a value that is never used. | main.rs:363:9:363:9 | x | x |
+| main.rs:371:17:371:17 | x | Variable $@ is assigned a value that is never used. | main.rs:371:17:371:17 | x | x |
+| more.rs:24:9:24:11 | val | Variable $@ is assigned a value that is never used. | more.rs:24:9:24:11 | val | val |
+| 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
index d5ee4e65515..d08b310e2d0 100644
--- a/rust/ql/test/query-tests/unusedentities/UnusedValue.qlref
+++ b/rust/ql/test/query-tests/unusedentities/UnusedValue.qlref
@@ -1 +1,2 @@
-queries/unusedentities/UnusedValue.ql
\ No newline at end of file
+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
index 2c570b31507..293fc4d9fed 100644
--- a/rust/ql/test/query-tests/unusedentities/UnusedVariable.expected
+++ b/rust/ql/test/query-tests/unusedentities/UnusedVariable.expected
@@ -1,22 +1,21 @@
-| main.rs:25:9:25:9 | a | Variable is not used. |
-| main.rs:90:13:90:13 | d | Variable is not used. |
-| main.rs:141:5:141:5 | y | Variable is not used. |
-| main.rs:168:9:168:9 | x | Variable is not used. |
-| main.rs:196:9:196:9 | x | Variable is not used. |
-| main.rs:201:9:201:9 | x | Variable is not used. |
-| main.rs:250:17:250:17 | a | Variable is not used. |
-| main.rs:258:20:258:22 | val | Variable is not used. |
-| main.rs:271:14:271:16 | val | Variable is not used. |
-| main.rs:288:22:288:24 | val | Variable is not used. |
-| main.rs:296:24:296:26 | val | Variable is not used. |
-| main.rs:305:13:305:15 | num | Variable is not used. |
-| main.rs:320:12:320:12 | j | Variable is not used. |
-| main.rs:342:25:342:25 | y | Variable is not used. |
-| main.rs:346:28:346:28 | a | Variable is not used. |
-| main.rs:350:9:350:9 | p | Variable is not used. |
-| main.rs:365:9:365:13 | right | Variable is not used. |
-| main.rs:371:9:371:14 | right2 | Variable is not used. |
-| main.rs:378:13:378:13 | y | Variable is not used. |
-| main.rs:386:21:386:21 | y | Variable is not used. |
-| main.rs:434:27:434:29 | val | Variable is not used. |
-| main.rs:437:22:437:24 | acc | Variable is not used. |
+| main.rs:27:9:27:9 | a | Variable 'a' is not used. |
+| main.rs:92:13:92:13 | d | Variable 'd' is not used. |
+| main.rs:141:5:141:5 | y | Variable 'y' is not used. |
+| main.rs:168:9:168:9 | x | Variable 'x' is not used. |
+| main.rs:240:17:240:17 | a | Variable 'a' is not used. |
+| main.rs:248:20:248:22 | val | Variable 'val' is not used. |
+| main.rs:262:14:262:16 | val | Variable 'val' is not used. |
+| main.rs:277:22:277:24 | val | Variable 'val' is not used. |
+| main.rs:284:24:284:26 | val | Variable 'val' is not used. |
+| main.rs:292:13:292:15 | num | Variable 'num' is not used. |
+| main.rs:307:12:307:12 | j | Variable 'j' is not used. |
+| main.rs:327:25:327:25 | y | Variable 'y' is not used. |
+| main.rs:330:28:330:28 | a | Variable 'a' is not used. |
+| main.rs:333:9:333:9 | p | Variable 'p' is not used. |
+| main.rs:351:9:351:13 | right | Variable 'right' is not used. |
+| main.rs:357:9:357:14 | right2 | Variable 'right2' is not used. |
+| main.rs:364:13:364:13 | y | Variable 'y' is not used. |
+| main.rs:372:21:372:21 | y | Variable 'y' is not used. |
+| main.rs:417:26:417:28 | val | Variable 'val' is not used. |
+| main.rs:420:21:420:23 | acc | Variable 'acc' is not used. |
+| main.rs:441:9:441:14 | unused | Variable 'unused' is not used. |
diff --git a/rust/ql/test/query-tests/unusedentities/UnusedVariable.qlref b/rust/ql/test/query-tests/unusedentities/UnusedVariable.qlref
index a1cd7d0a904..709d2b61d55 100644
--- a/rust/ql/test/query-tests/unusedentities/UnusedVariable.qlref
+++ b/rust/ql/test/query-tests/unusedentities/UnusedVariable.qlref
@@ -1 +1,2 @@
-queries/unusedentities/UnusedVariable.ql
\ No newline at end of file
+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
index 3b81b0db54a..ee315f63d00 100644
--- a/rust/ql/test/query-tests/unusedentities/main.rs
+++ b/rust/ql/test/query-tests/unusedentities/main.rs
@@ -1,12 +1,14 @@
-//fn cond() -> bool;
+mod unreachable;
+
+use unreachable::*;
 
 // --- locals ---
 
 fn locals_1() {
-    let a = 1; // BAD: unused value [NOT DETECTED]
+    let a = 1; // $ Alert[rust/unused-value]
     let b = 1;
     let c = 1;
-    let d = String::from("a"); // BAD: unused value [NOT DETECTED]
+    let d = String::from("a"); // $ Alert[rust/unused-value]
     let e = String::from("b");
     let f = 1;
     let _ = 1; // (deliberately unused)
@@ -22,7 +24,7 @@ fn locals_1() {
 }
 
 fn locals_2() {
-    let a: i32; // BAD: unused variable
+    let a: i32; // $ Alert[rust/unused-variable]
     let b: i32;
     let mut c: i32;
     let mut d: i32;
@@ -32,22 +34,22 @@ fn locals_2() {
     let h: i32;
     let i: i32;
 
-    b = 1; // BAD: unused value [NOT DETECTED]
+    b = 1; // $ Alert[rust/unused-value]
 
-    c = 1; // BAD: unused value [NOT DETECTED]
+    c = 1; // $ Alert[rust/unused-value]
     c = 2;
     println!("use {}", c);
-    c = 3; // BAD: unused value [NOT DETECTED]
+    c = 3; // $ Alert[rust/unused-value]
 
     d = 1;
     if cond() {
-        d = 2; // BAD: unused value [NOT DETECTED]
+        d = 2; // $ Alert[rust/unused-value]
         d = 3;
     } else {
     }
     println!("use {}", d);
 
-    e = 1; // BAD: unused value [NOT DETECTED]
+    e = 1; // $ Alert[rust/unused-value]
     if cond() {
         e = 2;
     } else {
@@ -58,16 +60,16 @@ fn locals_2() {
     f = 1;
     f += 1;
     println!("use {}", f);
-    f += 1; // BAD: unused value [NOT DETECTED]
+    f += 1; // $ Alert[rust/unused-value]
     f = 1;
-    f += 1; // BAD: unused value [NOT DETECTED]
+    f += 1; // $ Alert[rust/unused-value]
 
-    g = if cond() { 1 } else { 2 }; // BAD: unused value (x2) [NOT DETECTED]
+    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; // (deliberately unused) [NOT DETECTED]
+    _ = 1; // GOOD (deliberately unused)
 }
 
 // --- structs ---
@@ -84,10 +86,10 @@ impl MyStruct {
 }
 
 fn structs() {
-    let a = MyStruct { val: 1 }; // BAD: unused value [NOT DETECTED]
+    let a = MyStruct { val: 1 }; // $ Alert[rust/unused-value]
     let b = MyStruct { val: 2 };
     let c = MyStruct { val: 3 };
-    let mut d: MyStruct; // BAD: unused variable
+    let mut d: MyStruct; // $ Alert[rust/unused-variable]
     let mut e: MyStruct;
     let mut f: MyStruct;
 
@@ -98,22 +100,20 @@ fn structs() {
     e.val = 5;
     println!("lets use {}", e.my_get());
 
-    f = MyStruct { val: 6 }; // BAD: unused value [NOT DETECTED]
-    f.val = 7; // BAD: unused value [NOT DETECTED]
+    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]; // BAD: unused values (x3) [NOT DETECTED]
+    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
-	{
+    for k in ks {
         println!("lets use {}", k); // [unreachable FALSE POSITIVE]
     }
 }
@@ -121,16 +121,16 @@ fn arrays() {
 // --- constants and statics ---
 
 const CON1: i32 = 1;
-const CON2: i32 = 2; // BAD: unused value [NOT DETECTED]
+const CON2: i32 = 2; // $ MISSING: Alert[rust/unused-value]
 static mut STAT1: i32 = 1;
-static mut STAT2: i32 = 2; // BAD: unused value [NOT DETECTED]
+static mut STAT2: i32 = 2; // $ MISSING: Alert[rust/unused-value]
 
 fn statics() {
     static mut STAT3: i32 = 0;
-    static mut STAT4: i32 = 0; // BAD: unused value [NOT DETECTED]
+    static mut STAT4: i32 = 0; // $ MISSING: Alert[rust/unused-value]
 
     unsafe {
-        let total = CON1 + STAT1 + STAT3;
+        let total = CON1 + STAT1 + STAT3; // $ Alert[rust/unused-value]
     }
 }
 
@@ -138,7 +138,7 @@ fn statics() {
 
 fn parameters(
     x: i32,
-    y: i32,  // BAD: unused variable
+    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;
@@ -165,64 +165,54 @@ fn loops() {
         e += x;
     }
 
-    for x in 1..10 { // BAD: unused variable
+    for x in 1..10 { // $ Alert[rust/unused-variable]
     }
 
     for _ in 1..10 {}
 
-    for x
-    in 1..10 {
+    for x in 1..10 {
         println!("x is {}", x);
     }
 
-    for x
-    in 1..10 {
+    for x in 1..10 {
         println!("x is {:?}", x);
     }
 
-    for x
-    in 1..10 {
+    for x in 1..10 {
         println!("x + 1 is {}", x + 1);
     }
 
-    for x
-    in 1..10 {
-        for y
-        in 1..x {
+    for x in 1..10 {
+        for y in 1..x {
             println!("y is {}", y);
         }
     }
 
-    for x // SPURIOUS: unused variable
-    in 1..10 {
+    for x in 1..10 {
         println!("x is {x}");
     }
 
-    for x // SPURIOUS: unused variable
-    in 1..10 {
+    for x in 1..10 {
         _ = format!("x is {x}");
     }
 
-    for x
-    in 1..10 {
+    for x in 1..10 {
         println!("x is {val}", val = x);
     }
 
-    for x
-    in 1..10 {
+    for x in 1..10 {
         assert!(x != 11);
     }
 
-    for x
-    in 1..10 {
+    for x in 1..10 {
         assert_eq!(x, 1);
+        break;
     }
 
-    for x
-    in 1..10 {
+    for x in 1..10 {
         assert_eq!(id(x), id(1));
+        break;
     }
-
 }
 
 // --- lets ---
@@ -237,7 +227,7 @@ enum YesOrNo {
     No,
 }
 
-use YesOrNo::{Yes, No}; // allows `Yes`, `No` to be accessed without qualifiers.
+use YesOrNo::{No, Yes}; // allows `Yes`, `No` to be accessed without qualifiers.
 
 struct MyPoint {
     x: i64,
@@ -247,7 +237,7 @@ struct MyPoint {
 fn if_lets_matches() {
     let mut total: i64 = 0;
 
-    if let Some(a) = Some(10) { // BAD: unused variable
+    if let Some(a) = Some(10) { // $ Alert[rust/unused-variable]
     }
 
     if let Some(b) = Some(20) {
@@ -255,7 +245,8 @@ fn if_lets_matches() {
     }
 
     let mut next = Some(30);
-    while let Some(val) = next // BAD: unused variable
+    while let Some(val) = // $ Alert[rust/unused-variable]
+        next
     {
         next = None;
     }
@@ -268,41 +259,37 @@ fn if_lets_matches() {
 
     let c = Some(60);
     match c {
-        Some(val) => { // BAD: unused variable
-        }
-        None => {
+        Some(val) => { // $ Alert[rust/unused-variable]
         }
+        None => {}
     }
 
     let d = Some(70);
     match d {
         Some(val) => {
-            total += val;
-        }
-        None => {
+            total += val; // $ Alert[rust/unused-value]
         }
+        None => {}
     }
 
     let e = Option::Some(80);
     match e {
-        Option::Some(val) => { // BAD: unused variable
-        }
-        Option::None => {
+        Option::Some(val) => { // $ Alert[rust/unused-variable]
         }
+        Option::None => {}
     }
 
     let f = MyOption::Some(90);
     match f {
-        MyOption::Some(val) => { // BAD: unused variable
+        MyOption::Some(val) => { // $ Alert[rust/unused-variable]
         }
         MyOption::None => {}
     }
 
-    let g : Result<i64, i64> = Ok(100);
+    let g: Result<i64, i64> = Ok(100);
     match g {
-        Ok(_) => {
-        }
-        Err(num) => {} // BAD: unused variable
+        Ok(_) => {}
+        Err(num) => {} // $ Alert[rust/unused-variable]
     }
 
     let h = YesOrNo::Yes;
@@ -317,7 +304,7 @@ fn if_lets_matches() {
         No => {}
     }
 
-    if let j = Yes { // BAD: unused variable
+    if let j = Yes { // $ Alert[rust/unused-variable]
     }
 
     if let k = Yes {
@@ -327,8 +314,7 @@ fn if_lets_matches() {
     }
 
     let l = Yes;
-    if let Yes = l {
-    }
+    if let Yes = l {}
 
     match 1 {
         1 => {}
@@ -337,53 +323,53 @@ fn if_lets_matches() {
 
     let p1 = MyPoint { x: 1, y: 2 };
     match p1 {
-        MyPoint { x: 0, y: 0 } => {
+        MyPoint { x: 0, y: 0 } => {}
+        MyPoint { x: 1, y } => { // $ Alert[rust/unused-variable]
         }
-        MyPoint { x: 1, y } => { // BAD: unused variable
+        MyPoint { x: 2, y: _ } => {}
+        MyPoint { x: 3, y: a } => { // $ Alert[rust/unused-variable]
         }
-        MyPoint { x: 2, y: _ } => {
-        }
-        MyPoint { x: 3, y: a } => { // BAD: unused variable
-        }
-        MyPoint { x: 4, .. } => {
-        }
-        p => { // BAD: 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));
+    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"); }
+        Ok(n) => {
+            println!("duration was {} seconds", n.as_secs());
+        }
+        Err(_) => {
+            println!("failed");
+        }
     }
 
     let (left,
-        right) = // BAD: unused value [NOT DETECTED] SPURIOUS: unused variable
+        right) = // $ MISSING: Alert[rust/unused-value] $ SPURIOUS: Alert[rust/unused-variable]
         (1, 2);
     _ = left;
 
     let pair = (1, 2);
     let (left2,
-        right2) = // BAD: unused value [NOT DETECTED] SPURIOUS: unused variable
+        right2) = // $ MISSING: Alert[rust/unused-value] $ SPURIOUS: Alert[rust/unused-variable]
         pair;
     _ = left2;
 }
 
 fn shadowing() -> i32 {
-    let x = 1; // BAD: unused value [NOT DETECTED]
-    let mut y: i32; // BAD: unused variable
+    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; // BAD: unused value [NOT DETECTED]
-            let mut y: i32; // BAD: unused variable
+            let x = 3; // $ Alert[rust/unused-value]
+            let mut y: i32; // $ Alert[rust/unused-variable]
         }
 
         y = x;
@@ -402,18 +388,15 @@ fn increment(x: i32) -> i32 {
 fn func_ptrs() {
     let my_func: FuncPtr = increment;
 
-    for x
-    in 1..10 {
+    for x in 1..10 {
         _ = x + 1;
     }
 
-    for x
-    in 1..10 {
+    for x in 1..10 {
         _ = increment(x);
     }
 
-    for x
-    in 1..10 {
+    for x in 1..10 {
         _ = my_func(x);
     }
 }
@@ -425,20 +408,61 @@ fn folds_and_closures() {
     _ = a1.sum::<i32>();
 
     let a2 = 1..10;
-    _ = a2.fold(0, | acc: i32, val: i32 | -> i32 { acc + val } );
+    _ = a2.fold(0, |acc: i32, val: i32| -> i32 { acc + val });
 
     let a3 = 1..10;
-    _ = a3.fold(0, | acc, val | acc + val);
+    _ = a3.fold(0, |acc, val| acc + val);
 
     let a4 = 1..10;
-    _ = a4.fold(0, | acc, val | acc); // BAD: unused variable
+    _ = a4.fold(0, |acc, val| acc); // $ Alert[rust/unused-variable]
 
     let a5 = 1..10;
-    _ = a5.fold(0, | acc, val | val); // BAD: unused variable
+    _ = 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);
+    _ = 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
+        })
+    )
 }
 
 // --- main ---
@@ -449,16 +473,22 @@ fn main() {
     structs();
     arrays();
     statics();
-	println!("lets use result {}", parameters(1, 2, 3));
+    println!("lets use result {}", parameters(1, 2, 3));
     loops();
     if_lets_matches();
     shadowing();
     func_ptrs();
     folds_and_closures();
 
-	unreachable_if();
-	unreachable_panic();
-	unreachable_match();
-	unreachable_loop();
-	unreachable_paren();
+    unreachable_if_1();
+    // unreachable_panic();
+    unreachable_match();
+    // unreachable_loop();
+    unreachable_paren();
+    unreachable_let_1();
+    unreachable_let_2();
+    unreachable_if_2();
+    unreachable_if_3();
+
+    macros();
 }
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..cb33d5f40fc
--- /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, // $ SPURIOUS: Alert[rust/unused-value] $ MISSING: Alert[rust/unused-variable]
+    ) -> &T {
+        return &(self.val);
+    }
+}
+
+fn generics() {
+    let mut a = MyContainer { val: 1 }; // $ MISSING: Alert[rust/unused-value]
+    let b = MyContainer { val: 2 };
+
+    a.set(*b.get(3));
+}
+
+// --- pointers ---
+
+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
index 328c6edf0ea..9f206eb6eb3 100644
--- a/rust/ql/test/query-tests/unusedentities/unreachable.rs
+++ b/rust/ql/test/query-tests/unusedentities/unreachable.rs
@@ -1,178 +1,253 @@
+pub fn cond() -> bool {
+    get_a_number() == 1
+}
 
-//fn cond() -> bool;
-//fn get_a_number() -> i32;
+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() {
+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]
 }
 
-fn unreachable_if() {
-	if false {
-		do_something(); // BAD: unreachable code
-	} else {
-		do_something();
-	}
+pub fn unreachable_panic() {
+    if cond() {
+        do_something();
+        panic!("Oh no!!!");
+        do_something(); // $ MISSING: Alert[rust/dead-code]
+    }
 
-	if true {
-		do_something();
-	} else {
-		do_something(); // BAD: unreachable code
-	}
+    if cond() {
+        do_something();
+        unimplemented!();
+        do_something(); // $ MISSING: Alert[rust/dead-code]
+    }
 
-	let v = get_a_number();
-	if v == 1 {
-		if v != 1 {
-			do_something(); // BAD: unreachable code [NOT DETECTED]
-		}
-	}
+    if cond() {
+        do_something();
+        todo!();
+        do_something(); // $ MISSING: Alert[rust/dead-code]
+    }
 
-	if cond() {
-		return;
-		do_something(); // BAD: unreachable code
-	}
+    if cond() {
+        do_something();
+        unreachable!();
+        do_something(); // $ MISSING: Alert[rust/dead-code]
+    }
 
-	if cond() {
-		do_something();
-	} else {
-		return;
-		do_something(); // BAD: unreachable code
-	}
-	do_something();
+    if cond() {
+        let mut maybe;
 
-	if cond() {
-		let x = cond();
+        maybe = Some("Thing");
+        _ = maybe.unwrap(); // (safe)
+        do_something();
 
-		if (x) {
-			do_something();
-			if (!x) {
-				do_something(); // BAD: unreachable code [NOT DETECTED]
-			}
-			do_something();
-		}
-	}
+        maybe = if cond() { Some("Other") } else { None };
+        _ = maybe.unwrap(); // (might panic)
+        do_something();
 
-	if cond() {
-		return;
-	} else {
-		return;
-	}
-	do_something(); // BAD: unreachable code
+        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]
+    }
 }
 
-fn unreachable_panic() {
-	if cond() {
-		do_something();
-		panic!("Oh no!!!");
-		do_something(); // BAD: unreachable code [NOT DETECTED]
-	}
+pub fn unreachable_match() {
+    match get_a_number() {
+        1 => {
+            return;
+        }
+        _ => {
+            do_something();
+        }
+    }
+    do_something();
 
-	if cond() {
-		do_something();
-		unimplemented!();
-		do_something(); // BAD: unreachable code [NOT DETECTED]
-	}
-
-	if cond() {
-		do_something();
-		todo!();
-		do_something(); // BAD: unreachable code [NOT DETECTED]
-	}
-
-	if cond() {
-		do_something();
-		unreachable!();
-		do_something(); // BAD: unreachable code [NOT DETECTED]
-	}
-
-	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(); // BAD: unreachable code [NOT DETECTED]
-	}
-
-	if cond() {
-		do_something();
-		_ = false && panic!(); // does not panic due to short-circuiting SPURIOUS: unreachable
-		do_something();
-		_ = false || panic!();
-		do_something(); // BAD: unreachable code [NOT DETECTED]
-	}
-
-	if cond() {
-		do_something();
-		_ = true || panic!(); // does not panic due to short-circuiting SPURIOUS: unreachable
-		do_something();
-		_ = true && panic!();
-		do_something(); // BAD: unreachable code [NOT DETECTED]
-	}
+    match get_a_number() {
+        1 => {
+            return;
+        }
+        _ => {
+            return;
+        }
+    }
+    do_something(); // $ Alert[rust/dead-code]
 }
 
-fn unreachable_match() {
-	match get_a_number() {
-		1=>{
-			return;
-		}
-		_=>{
-			do_something();
-		}
-	}
-	do_something(); // [unreachable FALSE POSITIVE]
+pub fn unreachable_loop() {
+    loop {
+        do_something();
+        break;
+        do_something(); // $ Alert[rust/dead-code]
+    }
 
-	match get_a_number() {
-		1=>{
-			return;
-		}
-		_=>{
-			return;
-		}
-	}
-	do_something(); // BAD: unreachable 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]
+    }
+
+    for _ in 1..10 {
+        if cond() {
+            continue;
+            do_something(); // $ Alert[rust/dead-code]
+        }
+        do_something();
+    }
+
+    loop {
+        if cond() {
+            return;
+            do_something(); // $ Alert[rust/dead-code]
+        }
+    }
+    do_something(); // $ Alert[rust/dead-code]
+    do_something();
+    do_something();
 }
 
-fn unreachable_loop() {
-	loop {
-		do_something();
-		break;
-		do_something(); // BAD: unreachable code
-	}
-
-	if cond() {
-		while cond() {
-			do_something();
-		}
-
-		while false {
-			do_something(); // BAD: unreachable code
-		}
-
-		while true {
-			do_something();
-		}
-		do_something(); // BAD: unreachable code
-	}
-
-	loop {
-		if cond() {
-			return;
-			do_something(); // BAD: unreachable code
-		}
-	}
-	do_something(); // BAD: unreachable code
-	do_something();
-	do_something();
+pub fn unreachable_paren() {
+    let _ = (((1)));
 }
 
-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();
+}
+
+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();
 }
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/schema/annotations.py b/rust/schema/annotations.py
index 1cee04dd4b8..f8f5f182ad6 100644
--- a/rust/schema/annotations.py
+++ b/rust/schema/annotations.py
@@ -101,7 +101,13 @@ class _:
     """
 
 
-@annotate(PathExpr)
+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:
@@ -191,6 +197,7 @@ class _:
     ```
     """
 
+
 class CallExprBase(Expr):
     """
     A function or method call expression. See `CallExpr` and `MethodCallExpr` for further details.
@@ -213,6 +220,7 @@ class _:
     arg_list: drop
     attrs: drop
 
+
 @annotate(MethodCallExpr, replace_bases={Expr: CallExprBase})
 class _:
     """
@@ -836,12 +844,10 @@ class _:
 
 
 @annotate(AssocItemList)
+@qltest.test_with(Trait)
 class _:
     """
-    A AssocItemList. For example:
-    ```rust
-    todo!()
-    ```
+    A list of  `AssocItem` elements, as appearing for example in a `Trait`.
     """
 
 
@@ -1533,11 +1539,18 @@ class _:
 
 
 @annotate(Trait)
+@rust.doc_test_signature(None)
 class _:
     """
     A Trait. For example:
-    ```rust
-    todo!()
+    ```
+    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 {}
     ```
     """
 
@@ -1740,3 +1753,59 @@ class _:
     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/prelude.py b/rust/schema/prelude.py
index de905eb5b34..4f001ed2b5b 100644
--- a/rust/schema/prelude.py
+++ b/rust/schema/prelude.py
@@ -63,3 +63,11 @@ 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
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 58c08a41e01..1d586826314 100755
--- a/rust/tools/qltest.sh
+++ b/rust/tools/qltest.sh
@@ -1,40 +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
-  if [[ "$src" == "lib.rs" ]]; then
-    continue
-  elif [[ "$src" == "main.rs" ]]; then
-    continue
-  else
-    echo "mod ${src%.rs};" >> lib.rs
-  fi
-done
-cat > Cargo.toml << EOF
-[workspace]
-[package]
-name = "test"
-version="0.0.1"
-edition="2021"
-[lib]
-path="lib.rs"
-EOF
-if [[ -f "main.rs" ]]; then
-cat >> Cargo.toml << EOF
-[[bin]]
-name = "main"
-path = "main.rs"
-EOF
-fi
-"$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/shared/controlflow/CHANGELOG.md b/shared/controlflow/CHANGELOG.md
index 7aaa7597d5b..2eddc42a47d 100644
--- a/shared/controlflow/CHANGELOG.md
+++ b/shared/controlflow/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.11
+
+No user-facing changes.
+
 ## 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/codeql-pack.release.yml b/shared/controlflow/codeql-pack.release.yml
index 3865dbcf4b2..56a2fb38872 100644
--- a/shared/controlflow/codeql-pack.release.yml
+++ b/shared/controlflow/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.10
+lastReleaseVersion: 1.0.11
diff --git a/shared/controlflow/codeql/controlflow/Cfg.qll b/shared/controlflow/codeql/controlflow/Cfg.qll
index be05a5695a9..4130920daf6 100644
--- a/shared/controlflow/codeql/controlflow/Cfg.qll
+++ b/shared/controlflow/codeql/controlflow/Cfg.qll
@@ -1502,10 +1502,13 @@ module MakeWithSplitting<
       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) {
-      s = strictconcat(n.toString(), ",") and
-      strictcount(n.toString()) > 1
+      multipleToString(n) and
+      s = strictconcat(n.toString(), ",")
     }
 
     /** Holds if CFG scope `scope` lacks an initial AST node. */
diff --git a/shared/controlflow/qlpack.yml b/shared/controlflow/qlpack.yml
index 0d1248c0981..8e775a06b2c 100644
--- a/shared/controlflow/qlpack.yml
+++ b/shared/controlflow/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/controlflow
-version: 1.0.10
+version: 1.0.11
 groups: shared
 library: true
 dependencies:
diff --git a/shared/dataflow/CHANGELOG.md b/shared/dataflow/CHANGELOG.md
index c9f031d5113..72c27aa8762 100644
--- a/shared/dataflow/CHANGELOG.md
+++ b/shared/dataflow/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.1.5
+
+No user-facing changes.
+
 ## 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 26cbcd3f123..df39a9de059 100644
--- a/shared/dataflow/codeql-pack.release.yml
+++ b/shared/dataflow/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.1.4
+lastReleaseVersion: 1.1.5
diff --git a/shared/dataflow/codeql/dataflow/DataFlow.qll b/shared/dataflow/codeql/dataflow/DataFlow.qll
index 2011143334a..4a13dc7c36d 100644
--- a/shared/dataflow/codeql/dataflow/DataFlow.qll
+++ b/shared/dataflow/codeql/dataflow/DataFlow.qll
@@ -703,6 +703,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/DataFlowImpl.qll b/shared/dataflow/codeql/dataflow/internal/DataFlowImpl.qll
index 1bebea93c48..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
@@ -153,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()
     }
   }
@@ -224,6 +228,13 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
           hasFilteredSource()
         )
       }
+
+      bindingset[source, sink]
+      pragma[inline_late]
+      predicate isRelevantSourceSinkPair(Node source, Node sink) {
+        isFilteredSource(source) or
+        isFilteredSink(sink)
+      }
     }
 
     private import SourceSinkFiltering
@@ -357,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)
       )
@@ -395,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
@@ -530,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
@@ -677,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)
         )
@@ -723,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
@@ -847,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
@@ -1068,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
@@ -1621,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
           )
@@ -2286,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
           )
@@ -2589,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
               (
@@ -2633,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
             )
           }
@@ -2651,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
@@ -2699,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
@@ -2727,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)
@@ -2762,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
@@ -3246,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
@@ -3511,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
               |
@@ -3772,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]
@@ -4187,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) {
@@ -4392,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) {
@@ -4799,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)
@@ -4913,10 +4942,10 @@ 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) {
@@ -5252,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
@@ -5287,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
@@ -5559,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
@@ -5584,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/DataFlowImplConsistency.qll b/shared/dataflow/codeql/dataflow/internal/DataFlowImplConsistency.qll
index 48c4d42daaa..ca523e179c4 100644
--- a/shared/dataflow/codeql/dataflow/internal/DataFlowImplConsistency.qll
+++ b/shared/dataflow/codeql/dataflow/internal/DataFlowImplConsistency.qll
@@ -323,4 +323,18 @@ 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"
+      )
+    )
+  }
 }
diff --git a/shared/dataflow/codeql/dataflow/test/ProvenancePathGraph.qll b/shared/dataflow/codeql/dataflow/test/ProvenancePathGraph.qll
index 0260b8160a3..25ae20f184c 100644
--- a/shared/dataflow/codeql/dataflow/test/ProvenancePathGraph.qll
+++ b/shared/dataflow/codeql/dataflow/test/ProvenancePathGraph.qll
@@ -113,7 +113,7 @@ module TestPostProcessing {
         )
     }
 
-    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
diff --git a/shared/dataflow/qlpack.yml b/shared/dataflow/qlpack.yml
index 3d21af7c256..f2edfaaa25b 100644
--- a/shared/dataflow/qlpack.yml
+++ b/shared/dataflow/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/dataflow
-version: 1.1.4
+version: 1.1.5
 groups: shared
 library: true
 dependencies:
diff --git a/shared/mad/CHANGELOG.md b/shared/mad/CHANGELOG.md
index 02a3541df61..0d9dcaf2768 100644
--- a/shared/mad/CHANGELOG.md
+++ b/shared/mad/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.11
+
+No user-facing changes.
+
 ## 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/codeql-pack.release.yml b/shared/mad/codeql-pack.release.yml
index 3865dbcf4b2..56a2fb38872 100644
--- a/shared/mad/codeql-pack.release.yml
+++ b/shared/mad/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.10
+lastReleaseVersion: 1.0.11
diff --git a/shared/mad/qlpack.yml b/shared/mad/qlpack.yml
index b45f7415c81..13f5702a08c 100644
--- a/shared/mad/qlpack.yml
+++ b/shared/mad/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/mad
-version: 1.0.10
+version: 1.0.11
 groups: shared
 library: true
 dependencies:
diff --git a/shared/rangeanalysis/CHANGELOG.md b/shared/rangeanalysis/CHANGELOG.md
index 992ad108bcd..f3d5e9c3685 100644
--- a/shared/rangeanalysis/CHANGELOG.md
+++ b/shared/rangeanalysis/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.11
+
+No user-facing changes.
+
 ## 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/codeql-pack.release.yml b/shared/rangeanalysis/codeql-pack.release.yml
index 3865dbcf4b2..56a2fb38872 100644
--- a/shared/rangeanalysis/codeql-pack.release.yml
+++ b/shared/rangeanalysis/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.10
+lastReleaseVersion: 1.0.11
diff --git a/shared/rangeanalysis/qlpack.yml b/shared/rangeanalysis/qlpack.yml
index a11b83edace..d983bd5e1e4 100644
--- a/shared/rangeanalysis/qlpack.yml
+++ b/shared/rangeanalysis/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/rangeanalysis
-version: 1.0.10
+version: 1.0.11
 groups: shared
 library: true
 dependencies:
diff --git a/shared/regex/CHANGELOG.md b/shared/regex/CHANGELOG.md
index 3a71d968b43..e4aa1758db2 100644
--- a/shared/regex/CHANGELOG.md
+++ b/shared/regex/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.11
+
+No user-facing changes.
+
 ## 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/codeql-pack.release.yml b/shared/regex/codeql-pack.release.yml
index 3865dbcf4b2..56a2fb38872 100644
--- a/shared/regex/codeql-pack.release.yml
+++ b/shared/regex/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.10
+lastReleaseVersion: 1.0.11
diff --git a/shared/regex/qlpack.yml b/shared/regex/qlpack.yml
index bfb63fdee77..3095d292497 100644
--- a/shared/regex/qlpack.yml
+++ b/shared/regex/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/regex
-version: 1.0.10
+version: 1.0.11
 groups: shared
 library: true
 dependencies:
diff --git a/shared/ssa/CHANGELOG.md b/shared/ssa/CHANGELOG.md
index 76edd23e442..6fc1f4442c7 100644
--- a/shared/ssa/CHANGELOG.md
+++ b/shared/ssa/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.11
+
+No user-facing changes.
+
 ## 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/codeql-pack.release.yml b/shared/ssa/codeql-pack.release.yml
index 3865dbcf4b2..56a2fb38872 100644
--- a/shared/ssa/codeql-pack.release.yml
+++ b/shared/ssa/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.10
+lastReleaseVersion: 1.0.11
diff --git a/shared/ssa/qlpack.yml b/shared/ssa/qlpack.yml
index 7e09739a333..8ed011cbb28 100644
--- a/shared/ssa/qlpack.yml
+++ b/shared/ssa/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/ssa
-version: 1.0.10
+version: 1.0.11
 groups: shared
 library: true
 dependencies:
diff --git a/shared/threat-models/CHANGELOG.md b/shared/threat-models/CHANGELOG.md
index b62e06e3dff..1c514d078a2 100644
--- a/shared/threat-models/CHANGELOG.md
+++ b/shared/threat-models/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.11
+
+No user-facing changes.
+
 ## 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/codeql-pack.release.yml b/shared/threat-models/codeql-pack.release.yml
index 3865dbcf4b2..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.10
+lastReleaseVersion: 1.0.11
diff --git a/shared/threat-models/qlpack.yml b/shared/threat-models/qlpack.yml
index 7609a088b6e..8bb32934cca 100644
--- a/shared/threat-models/qlpack.yml
+++ b/shared/threat-models/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/threat-models
-version: 1.0.10
+version: 1.0.11
 library: true
 groups: shared
 dataExtensions:
diff --git a/shared/tutorial/CHANGELOG.md b/shared/tutorial/CHANGELOG.md
index 676b469b866..416a3ab33fc 100644
--- a/shared/tutorial/CHANGELOG.md
+++ b/shared/tutorial/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.11
+
+No user-facing changes.
+
 ## 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/codeql-pack.release.yml b/shared/tutorial/codeql-pack.release.yml
index 3865dbcf4b2..56a2fb38872 100644
--- a/shared/tutorial/codeql-pack.release.yml
+++ b/shared/tutorial/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.10
+lastReleaseVersion: 1.0.11
diff --git a/shared/tutorial/qlpack.yml b/shared/tutorial/qlpack.yml
index 1cfbfb40c91..b07e90072a9 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.10
+version: 1.0.11
 groups: shared
 library: true
 warnOnImplicitThis: true
diff --git a/shared/typeflow/CHANGELOG.md b/shared/typeflow/CHANGELOG.md
index 19badb815f9..1506cdea175 100644
--- a/shared/typeflow/CHANGELOG.md
+++ b/shared/typeflow/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.11
+
+No user-facing changes.
+
 ## 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/codeql-pack.release.yml b/shared/typeflow/codeql-pack.release.yml
index 3865dbcf4b2..56a2fb38872 100644
--- a/shared/typeflow/codeql-pack.release.yml
+++ b/shared/typeflow/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.10
+lastReleaseVersion: 1.0.11
diff --git a/shared/typeflow/qlpack.yml b/shared/typeflow/qlpack.yml
index 430f9e46812..a810b9a0497 100644
--- a/shared/typeflow/qlpack.yml
+++ b/shared/typeflow/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/typeflow
-version: 1.0.10
+version: 1.0.11
 groups: shared
 library: true
 dependencies:
diff --git a/shared/typetracking/CHANGELOG.md b/shared/typetracking/CHANGELOG.md
index 29b2bdbb3da..d35be2a3771 100644
--- a/shared/typetracking/CHANGELOG.md
+++ b/shared/typetracking/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.11
+
+No user-facing changes.
+
 ## 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/codeql-pack.release.yml b/shared/typetracking/codeql-pack.release.yml
index 3865dbcf4b2..56a2fb38872 100644
--- a/shared/typetracking/codeql-pack.release.yml
+++ b/shared/typetracking/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.10
+lastReleaseVersion: 1.0.11
diff --git a/shared/typetracking/qlpack.yml b/shared/typetracking/qlpack.yml
index d29f0c0bd6e..ea710511205 100644
--- a/shared/typetracking/qlpack.yml
+++ b/shared/typetracking/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/typetracking
-version: 1.0.10
+version: 1.0.11
 groups: shared
 library: true
 dependencies:
diff --git a/shared/typos/CHANGELOG.md b/shared/typos/CHANGELOG.md
index 0f6b529e512..e5392886a3e 100644
--- a/shared/typos/CHANGELOG.md
+++ b/shared/typos/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.11
+
+No user-facing changes.
+
 ## 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/codeql-pack.release.yml b/shared/typos/codeql-pack.release.yml
index 3865dbcf4b2..56a2fb38872 100644
--- a/shared/typos/codeql-pack.release.yml
+++ b/shared/typos/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.10
+lastReleaseVersion: 1.0.11
diff --git a/shared/typos/qlpack.yml b/shared/typos/qlpack.yml
index 4e15f26a72c..1c3b0174608 100644
--- a/shared/typos/qlpack.yml
+++ b/shared/typos/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/typos
-version: 1.0.10
+version: 1.0.11
 groups: shared
 library: true
 warnOnImplicitThis: true
diff --git a/shared/util/CHANGELOG.md b/shared/util/CHANGELOG.md
index f81ed05cc13..9f1057cba24 100644
--- a/shared/util/CHANGELOG.md
+++ b/shared/util/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.11
+
+No user-facing changes.
+
 ## 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/codeql-pack.release.yml b/shared/util/codeql-pack.release.yml
index 3865dbcf4b2..56a2fb38872 100644
--- a/shared/util/codeql-pack.release.yml
+++ b/shared/util/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.10
+lastReleaseVersion: 1.0.11
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/qlpack.yml b/shared/util/qlpack.yml
index d73aee51170..ee289f97e6e 100644
--- a/shared/util/qlpack.yml
+++ b/shared/util/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/util
-version: 1.0.10
+version: 1.0.11
 groups: shared
 library: true
 dependencies: null
diff --git a/shared/xml/CHANGELOG.md b/shared/xml/CHANGELOG.md
index bc002596b45..6ef34d6264c 100644
--- a/shared/xml/CHANGELOG.md
+++ b/shared/xml/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.11
+
+No user-facing changes.
+
 ## 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/codeql-pack.release.yml b/shared/xml/codeql-pack.release.yml
index 3865dbcf4b2..56a2fb38872 100644
--- a/shared/xml/codeql-pack.release.yml
+++ b/shared/xml/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.10
+lastReleaseVersion: 1.0.11
diff --git a/shared/xml/qlpack.yml b/shared/xml/qlpack.yml
index 56f477c27e1..1f635d9451c 100644
--- a/shared/xml/qlpack.yml
+++ b/shared/xml/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/xml
-version: 1.0.10
+version: 1.0.11
 groups: shared
 library: true
 dependencies:
diff --git a/shared/yaml/CHANGELOG.md b/shared/yaml/CHANGELOG.md
index a6804be0127..79fc573c5ae 100644
--- a/shared/yaml/CHANGELOG.md
+++ b/shared/yaml/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.11
+
+No user-facing changes.
+
 ## 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/codeql-pack.release.yml b/shared/yaml/codeql-pack.release.yml
index 3865dbcf4b2..56a2fb38872 100644
--- a/shared/yaml/codeql-pack.release.yml
+++ b/shared/yaml/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.10
+lastReleaseVersion: 1.0.11
diff --git a/shared/yaml/qlpack.yml b/shared/yaml/qlpack.yml
index b1e351ce196..8c2d12ff8f3 100644
--- a/shared/yaml/qlpack.yml
+++ b/shared/yaml/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/yaml
-version: 1.0.10
+version: 1.0.11
 groups: shared
 library: true
 warnOnImplicitThis: true
diff --git a/swift/ql/lib/CHANGELOG.md b/swift/ql/lib/CHANGELOG.md
index 004e85afa62..d871246f42f 100644
--- a/swift/ql/lib/CHANGELOG.md
+++ b/swift/ql/lib/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.0.3
+
+No user-facing changes.
+
 ## 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 81c7f1dbc13..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.2
+lastReleaseVersion: 2.0.3
diff --git a/swift/ql/lib/codeql/swift/dataflow/internal/DataFlowImpl1.qll b/swift/ql/lib/codeql/swift/dataflow/internal/DataFlowImpl1.qll
index ce964917e97..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) {
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/qlpack.yml b/swift/ql/lib/qlpack.yml
index 31dd6d915f3..20827d50250 100644
--- a/swift/ql/lib/qlpack.yml
+++ b/swift/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/swift-all
-version: 2.0.2
+version: 2.0.3
 groups: swift
 extractor: swift
 dbscheme: swift.dbscheme
diff --git a/swift/ql/src/CHANGELOG.md b/swift/ql/src/CHANGELOG.md
index daeeee421ba..8890e7e83a4 100644
--- a/swift/ql/src/CHANGELOG.md
+++ b/swift/ql/src/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.11
+
+No user-facing changes.
+
 ## 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/codeql-pack.release.yml b/swift/ql/src/codeql-pack.release.yml
index 3865dbcf4b2..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.10
+lastReleaseVersion: 1.0.11
diff --git a/swift/ql/src/qlpack.yml b/swift/ql/src/qlpack.yml
index 17bf94f219d..3fc024c3331 100644
--- a/swift/ql/src/qlpack.yml
+++ b/swift/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/swift-queries
-version: 1.0.10
+version: 1.0.11
 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/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)",